我正在使用git flow工具,但遇到一些问题。我的git分支分歧了。我已经读过master分支,并且“ origin / master”已经分开,如何“ un分歧”分支?并尝试按照以下步骤进行操作,即尝试合并并重新建立本地存储库。
$ git flow feature finish showFindLogs
Branches 'develop' and 'origin/develop' have diverged.
And branch 'develop' may be fast-forwarded.
$ git merge origin/develop
Already up-to-date.
$ git rebase origin/develop
Current branch feature/showFindLogs is up to date.
$ git status
# On branch feature/showFindLogs
nothing to commit (working directory clean)
我该如何摆脱呢?我已经完成了git flow功能,并且只想将更改发布到远程。谢谢!
git checkout develop && git pull origin
创建“将源/从开发合并到开发中”的提交消息?不会git checkout develop && git rebase origin
(又名git pull --rebase origin
)在这种情况下更好?