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

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?

  • git conflict - file deleted in HEAD and modified in revision
  • How to undo changes matching a pattern in multiple commits?
  • rename Folder in Origin
  • How to automatically resolve merge conflicts by selecting the remote version in Git?
  • How to reinitialize a git-svn repository
  • How to determine if a git merge was the wrong way
  • Git command not recognized; where is it located?
  • Does git “dirty” mean files not staged, or not committed? (glossary conflict)
  • git update/patch on remote host without internet
  • Git: can I suppress listing of 'modified content'/dirty submodule entries in status, diff, etc?
  • difference from: git merge branch vs git merge branch master
  • Git clone error in Xcode
  • One Solution collect form web for “How to resume Git-Flow after a break cause by a merge conflict on a finish command?”

    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.

    Git Baby is a git and github fan, let's start git clone.