Thanks for this interesting write up. I learned some valuable best practices. In the event where you have to merge multiple independent branches (containing different features but with potential conflicts) do you recommend a specific order/strategy for the merge & syncs?