branch

我不想重命名远程分支，如 重命名本地和远程Git存储库的master分支中 所述。 如何重命名尚未推送到远程分支的本地分支？ 如果您还需要重命名 远程 分支： 如何重命名Git本地和远程分支名称 #1楼 git branch -m old_branch_name new_branch_name 上面的命令将更改您的分支名称，但是使用重命名的分支必须非常小心，因为它仍将引用与其关联的旧的上游分支（如果有）。 如果要在将本地分支重命名为new_branch_name（示例名称）后将一些更改推送到master中，请执行以下操作： git push origin new_branch_name:master （现在更改将转到master分支，但您的本地分支名称为new_branch_name） 有关更多详细信息，请参见“ 如何在Git中重命名本地分支名称 ”。 #2楼 重命名当前分支： git branch -m <newname> #3楼 到目前为止，答案是正确的，但是这里有一些其他信息： 可以安全地用'-m'重命名分支（移动），但是使用'-M'时要小心，因为即使已经存在相同名称的分支，它也会强制重命名。 以下是“ git-branch”手册页的摘录： 使用-m或-M选项， <oldbranch> 将重命名为 <newbranch> 。 如果 <oldbranch> 具有相应的引用日志

As far as I know, commit object contains information only about parents, so if I have situation something like this: * branch-1 | o | o master | o which is some kind of equivalent of * branch-1 | o / o master | o but what if my master will go forward? o master | o * branch-1 | | o o |/ o | o being on branch-1, git log --graph --decorate will show me only: * branch-1 | o | o | o if I know from which branch I was started, I can call git merge-base master branch-1 , but what if I don't know from which branch I was started? PS. I am still learning English, however sometimes I am making stupid

I've got a (remote) Hg repository with a couple branches. I want to verify that branch A has every changeset that branch B has (it may have more, and that's OK). Is there an easy way to do this with just hg ? I can write a little shell script to do it, but it seems like the sort of thing that might come up a lot, so maybe there's an easy built-in way. This will show any ancestors of changeset b which are not an ancestor of changeset a : hg log -r "ancestors(b) and not ancestors(a)" This should show you which changes still need to be merged from B to A if you give the head of branch B for b,

If you always synchronise a feature branch before you merge it back. Why do you really have to use the --reintegrate option? The Subversion book says: When merging your branch back to the trunk, however, the underlying mathematics is quite different. Your feature branch is now a mishmosh of both duplicated trunk changes and private branch changes, so there's no simple contiguous range of revisions to copy over. By specifying the --reintegrate option, you're asking Subversion to carefully replicate only those changes unique to your branch. (And in fact, it does this by comparing the latest

I'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I try to reintegrate the changes from the branch I get the following error message: Command: Reintegrate merge https://dev/svn/branches/devel into C:\trunk Error: Reintegrate can only be used if revisions 280 through 325 were previously Error: merged from https://dev/svn/trunk to the reintegrate Error: source, but this is not the case: Error: branches/devel/images/test Error: Missing ranges: /trunk

I have some commits that I've decided, after the fact, are going to be more branch work then trunk work. How do I create the branch and revert the trunk while still ensuring merging isn't painful later? Is it as simple as copying the current trunk to a branch and reverting the trunk? Or will this create headaches later? I think Philips method would be something like the following, assuming the last "good" revision was at 100 and you are now at 130, to create the new branch: svn copy -r100 svn://repos/trunk svn://repos/branches/newbranch svn merge -r 100:130 svn://repos/trunk svn://repos