Transcript

A conflict is when something on any page or tab is changed in different ways in both the source branch and the base branch. The conflict resolution interface organizes conflicts by page, and gives you the option to resolve all conflicts in favor of one branch on a page by page basis.

In this example, the conflict resolution UI identifies the conflict on this button, and as you might perform this merge, you would have the option to select which changes you wish to incorporate from which branch. In this case, let's say you've changed the color of a button to blue in your child branch, but in the parent branch, it's been set to green. You would then choose to continue the merge with your branch's change selected and complete the merge. Then, your changes would be successfully integrated from the source branch to the base branch.

Then, once you know that your child branch doesn't have any problematic conflicts with your parent branch, you can proceed with safely merging your changes up the hierarchy until they're in Main and ready for deployment. This all becomes especially useful when many conflicts arise across multiple pages or even between tabs. The UI will allow you to investigate each and every conflict as needed, or you can just resolve the conflicts in favor of one branch for any given page.

You can think of the entire merge flow as an opportunity to preview the result of the merge before you complete it. If you're actually not happy with how things are looking, you can cancel the merge at any time without any consequences. Or, if you're happy with how things are looking, you can go ahead and complete the merge. When it's time for another merge, you would repeat the same process for all your other branches.