git flow branches have diverged

Question

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!

Upside

Answer 1

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:

1. sync your local develop with origin: checkout develop, and pull from origin to develop (git checkout develop && git pull origin)

2. rebase your feature on develop with git flow feature rebase showFindLogs. You may have conflicts here if you're unlucky

3. check that it doesn't break anything

4. git flow feature finish showFindLogs

Lozoya

Won't git checkout develop && git pull origin create a "Merging origin/develop into develop" commit message? Wouldn't git checkout develop && git rebase origin (aka git pull --rebase origin) be better in this situation? – Outhaul

@PeterB: yes indeed, if develop and origin/develop have diverged, but it's not a common situation – Lozoya

git pull origin was what fixed it for me. I did a merge to my branch instead of rebase. – Cyclopedia

What to do if my develop is already up to date but still I've got the diverged state for the feature/new branch when I try to rebase it? previously, I've merged feature/old branch into develop, but old and new branches have no conflicts... – Bedard

@Bedard Have you rebased your feature branch on develop? – Lozoya

@Lozoya I've tried to do that when I've got this issue with diverged state. I've ended up with making an empty merge between origin feature branch and local feature. Not sure why git denied to make fast-forward... – Bedard

In Intellij: Go to Settings, search for "executive branch operations on all roots" and uncheck this checkmark. – Afterthought

Why Git has to be so darn complicated. Look like it was made by linux guys ;) – Relief

Answer 2

Make sure your develop branch is not behind origin, maybe you need to perform

git checkout develop
git pull
git checkout release/x.x.x

And continue the release process

Goodard

Answer 3

All i had to do was:

1. git checkout develop
2. git pull origin develop
3. git checkout feature/your_feature_name
4. git flow finish

Concealment

Answer 4

you might also want to ((as long it is not officially supported) patch and) use my

git-flow feature finish -p option

https://github.com/nvie/gitflow/pull/253

Patellate

Answer 5

You can fetch from $ORIGIN before finish feature with this command:

git flow feature finish -F <name>

(docs)

Detoxicate

Answer 6

For whoever googling this error, and using Hub-Flow - just do:

git hf update

Harp

Answer 7

For solve that problem you can use my implementation of git flow, based on @childno͡.de solution.

git flow feature/hotfix/release/bugfix  -e finish <name>

To install git flow execute in console:

git clone https://github.com/wyhasany/gitflow-avh/;cd gitflow-avh/;git checkout feature/force_merge;git pull;sudo make install

Blooming