H, I just did a merge as follows:
\\ebi\daan:~/cloudstack-4.5/cloudstack (master)> git merge --no-commit --stat --verbose --progress --strategy ours 4.5 Automatic merge went well; stopped before committing as requested \\ebi\daan:~/cloudstack-4.5/cloudstack (master|MERGING)> git diff \\ebi\daan:~/cloudstack-4.5/cloudstack (master|MERGING)> git commit [master 48f0b7b] Merge branch '4.5' As it didn't result in anything I won't push. I will repeat this practice over the coming days so ask of all to only put fixes in 4.5 (and earlier branches). Some have been applying the same patch to both 4.5 and master. This is not needed with the above approach and the payoff is that there is a link in the git metadata showing that the exact same patch is in both branches. I cannot tell for sure how merge-back of features in master and conflict resolution of that is going to be. Hopefully it won't be as bad as last nights efforts. -- Daan
