我有一个远程代码库。 我进行以下操作:
git clone https://mylogin@bitbucket.org/mylogin/myrepo.git
Clone成功。
我有Git树:C(master)
| B:A
| /
B /
|
A
|
A0
|
A01(origin/head)(origin/master)
|
(一些提交)
我需要:
B:A
C(master) /
我需要将分支B rebase到C(master) 我的操作:
git checkout b1
Switched to branch 'b1'
git rebase master
First, rewinding head to replay your work on top of it...
Applying: B:A
Using index info to reconstruct a base tree...
M index1.txt
Falling back to patching base and 3-way merge...
Auto-merging index1.txt
CONFLICT (content): Merge conflict in index1.txt
Failed to merge in the changes.
Patch failed at 0001 B:A
The copy of the patch that failed is found in:
/pth/to dir/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
git branch
* (no branch)
b1
master
我该怎么做? 我可以切换到b1分支,解决冲突并提交,但这并没有帮助(我已经测试过了)。
index1.txt
),而不是patch
文件。如果您不确定正在重新基于哪个更改,则可以参考patch
文件。 - Tor Klingberg