Menu
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?
908
A merge conflict is an event that occurs when Git is unable to automatically resolve differences in code between two commits. When all the changes in the code occur on different lines or in different files, Git will successfully merge commits without your help.
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.
117
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
