0

我从 master 分叉了一个分支 A。然后过了一段时间，我从分支 A 分叉了另一个分支 B。现在，每当我将代码推送到分支 AI 时，都会看到下面的消息。我怎样才能摆脱它？

   ff65b4e..304e3f6  A -> A
 ! [rejected]        B -> B (non-fast-forward)
error: failed to push some refs to 'git@xxx'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and merge the remote changes
hint: (e.g. 'git pull') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

$ git log --all --graph
* commit 304e3f60363fe734fc4eebab79b23a1dc6528ea3
| Author: xxxx
| Date:   xxxxxxxx
|
|    xxxxxxxxxx
|
* commit ff65b4e3ae91117f8ffb12a60ada81f888a94275
| Author: xxxx
| Date:   xxxx
|
|     xxxx
4

1 回答 1

0 
git checkout B
git pull

Fix any conflicts

git push
于 2013-04-24T20:32:41.320 回答