How to resume Git-Flow after a break cause by a merge conflict on a finish command?

git git-flow
JudgeProphet picture JudgeProphet · Feb 7, 2013 · Viewed 11.5k times · Source

Do i really need to complete all the step by hand every time I "Finish" a branch and there is a conflict merging it with Git-Flow? Or there's a way to resume after all the conflict are solved?

Answer

Jonno picture Jonno · Sep 16, 2013

After resolving the conflict, you simply call

git flow release finish [RELEASE_NAME]

again. git is 'smart' in that if you try to do merge from branch A to branch B more than once, the second and subsequent times are ignored with "Already up-to-date" as long as the source of the merge has not changed.

Related questions

Git merge master into feature branch

Let’s say we have the following situation in Git: A created repository: mkdir GitTest2 cd GitTest2 git init Some modifications in the master take place and get committed: echo "On Master" > file git commit -a -m "Initial commit" …

Read More
Create a branch in Git from another branch

I have two branches: master and dev I want to create a "feature branch" from the dev branch. Currently on the branch dev, I do: $ git checkout -b myfeature dev ... (some work) $ git commit -am "blablabla" $ git push origin myfeature …

Read More
git flow branches have diverged

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, …

Read More