git flow branches have diverged
git, git-flow
Solution
What happens here is that the remote has received updates, and git-flow requires that `develop` and `origin/develop` to be at the same commit before merging back the feature. This is to prevent bad conflicts when publishing the branch.
To solve this, you need to:
sync your local `develop` with `origin`: checkout `develop`, and pull from `origin` to `develop` (`git checkout develop && git pull origin`)
rebase your feature on `develop` with `git flow feature rebase showFindLogs`. You may have conflicts here if you're unlucky
check that it doesn't break anything
`git flow feature finish showFindLogs`
Problem
I'm using the git flow tools and I've gotten myself in a bit of problem. My git branches have diverged. I've read master branch and 'origin/master' have diverged, how to 'undiverge' branches'? and have tried to follow the steps, both attempting to merge and to rebase my local repository. ``` $ 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) ``` How can I get out of this? I'm done with the git flow feature and I'd just like to get my changes up to the remote. Thanks!