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.

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)