Remove ambiguity for branches with matching local fork names#132
Remove ambiguity for branches with matching local fork names#132bfonta wants to merge 1 commit intocms-sw:masterfrom
Conversation
|
type ngt |
|
A new Pull Request was created by @bfonta for branch master. @akritkbehera, @cmsbuild, @iarspider, @raoatifshad, @smuzaffar can you please review it and eventually sign? Thanks. |
|
cms-bot internal usage |
|
Upon further inspection, I noticed that I can only reproduce the error if, before rebasing, I run: git remote add fork git@github.com:fork:mybranch.git
git fetch forkIt thus seems that the cause for the error is not connected to the branch names of other forks. If we run git remote rm forkand then try the rebase again, it works. At the same time, the current fix does remove the ambiguity, but after some more investigation I noticed that the resulting branch is not rebased on top of the current release, only checked out. The reason for this is not yet clear to me. I would thus ignore the proposed changes, but keep this PR open in case the same error message appears in a different context. |
Using the command
git-cms-rebase-topic(an alias togit-cms-merge-topic), I get the following error whenever the fork I'm taking the branch from and my personal fork (pointed at bymy-cmssw) have a branch with the same name ("mybranch" in the example below).Repeating the rebase with the proposed fix removes the ambiguity.