您的分支领先 'origin/feature/STRY0017346' x 次提交

Question

我的工作流程如下：

git 拉源开发
git 流特征开始 xyz
<在这里做一些工作，喝很多咖啡>
git commit -m "blabla"
最后 git 流特征完成 xyz

这就是我今天所做的，但是当我尝试完成我的功能时，我得到：

Branches 'feature/STRY0017346' and 'origin/feature/STRY0017346' have diverged. And local branch 'feature/STRY0017346' is ahead of 'origin/feature/STRY0017346'. Branches 'develop' and 'origin/develop' have diverged. Fatal: And branch 'develop' may be fast-forwarded.

当我做的时候git status

On branch feature/STRY0017346 Your branch is ahead of 'origin/feature/STRY0017346' by 2 commits. (use "git push" to publish your local commits) nothing to commit, working directory clean

非常混乱，我不确定如何解决这个问题。我第一次遇到这种情况。

Answer 1

我通过执行以下操作解决了这个问题：

git checkout develop

然后

git pull origin develop

我终于完成了我的功能

git flow feature finish xzy

您的分支领先 'origin/feature/STRY0017346' x 次提交

Your branch is ahead of 'origin/feature/STRY0017346' by x commits

git

git-flow