In some cases, the merge tool cannot resolve conflicts from multiple branches at once, leading to the script failing repeatedly regardless of saved merge conflict resolution, etc. Instead, merging the branches one by one ensures conflicts can be resolved properly and reduces the complexity of conflict resolution when multiple conflicts may exist.master
parent
a4e10ab65b
commit
aedc9127d9
Loading…
Reference in new issue