Resolving diverged branches

Occasionally, you or your team members may run into a diverged branch. This most frequently occurs if your network connection is spotty while merging a branch or you've been working offline while colleagues have continued to make changes to the project.

A diverged branch means the data you're looking at locally isn't the same as what is currently stored on our servers.

To resolve such situations, first click Resolve Diverged Branch... in the top right corner.diverged.png

Click the Create Master (Diverged Copy) button from the lightbox that appears.

Next, you'll be prompted to Update from Master.

update.png

You'll now be asked to select which version of your file you wish to retain (your local copy or that which resides on Abstract servers).

select.png

Finally, commit your changes, merge to Master, and your diverged branches will be resolved.

end.png

Was this article helpful?