Finish Merge Order is Incorrect

[demyte]

Hi,

I was wondering what the reason was that on hotfix finish, you merge dev before master as this is the opposite way around to how GitFlow does it.

The issue I have here is that inevitably, if there is a merge conflict, it is with dev not master as in all probability it is far more diverged than master.

This means that the hotfix fails straight away.

When you merge with master first, it is more than usually successful (i.e. 99%+ of the time) and then when you merge to dev if it fails you are in a state where you can fix the conflicts, test and then finish the merge and commit, finishing the hotfix then and there without having to do it all manually as you would if the dev merge went first.

Thanks

James

[smith-kyle]

Originally the merge order was chosen because merge conflicts occur with dev more often than master. It seemed better to not leave the branch in a half finished state if a conflict with dev was aborted. But you're right, GitFlow merges master then development. They also skip the merge if the release or hotfix branch was already merged into master on a previous attempt.

When the merge order is changed we should also add the logic to not merge the branch into master if it has been already.