Resolve conflicts

Update from the main branch

As you design using Abstract, you may be prompted to Update from Main. This means that you or someone on your team has merged their branch to the main branch and your branch now differs from the main branch. Pull their changes into your branch by updating from the main branch.

Branches_Update-Branch-button.png

Watch our "Learn Abstract Version Control" YouTube video series for in-depth explanations of updating from the main branch and resolving merge conflicts.

What to do about conflicts

When you update from the main branch, you may encounter conflicts between the designs on your branch and the designs on the main branch. Abstract surfaces these differences and lets you choose which artboard(s) you’d like to keep.

For example, let's say your branch contains artboards with an orange triangle, purple circle, and yellow square. The main branch, on the other hand, has those same artboards with a blue triangle, red circle, and green square.

In order to update from the main branch, decide which artboards you’d like to keep. You can choose to resolve conflicts one-by-one or in batches.

View conflicts with overlay mode

In addition to a side by side comparison, you can overlay two versions of a given artboard when updating from the main branch or a parent branch. When you compare the versions, Branches only shows the conflicts.

To view the artboards in overlay mode, select Overlay from the drop down menu and follow the steps to resolve the conflicts.

Branches_Merge-Conflicts-Overlay.png.

Resolve conflicts individually

For each conflict, you can choose individual artboards to keep by clicking Pick artboard below the artboard you want. Continue this process until all conflicts are resolved.

Once all conflicts are resolved, Branches prompts you to commit.

Batch resolve conflicts

When resolving multiple conflicts, you have the option to choose batches of artboards to keep. You must choose either everything on the main branch or everything on your current branch.

There are three options for batch resolving conflicts:

  • All items on this page
  • All items in this file
  • All items in this update

After you make your selection, Branches prompts you to confirm and commit.

You can find more in-depth detail about resolving conflicts in our merging best practices guide.