我正在使用 git flow 工具,但我遇到了一些问题。我的 git 分支已经发散了。我读过master 分支和“origin/master”已经分歧,如何“取消分歧”分支?并尝试按照这些步骤尝试合并和重新设置我的本地存储库。
$ 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 功能,我只想将我的更改发送到远程。谢谢!