Incomplete merges or updates
Who can use this feature
Only people with an editor role in an organization or workspace can access the branching feature
Anyone with can edit access to the main file can merge branches.
This is one step in the branching process. For more information on branching, check out our Guide to branching.
There are a few steps involved in receiving updates and merging changes. And while uncommon, it’s possible for something to go wrong at one of those steps.
If it does, you may find yourself in a situation where a merge or update didn't complete. We’re working on improvements that will reduce the chances of this happening.
In the meantime, there are a few things you can do if something doesn’t look right after a merge or update.
Issues
| Problem | Solution |
|
Updates from a previous merge show up as conflicts you still need to resolve. This means a previous update from main didn’t complete. |
You have two options available:
|
|
Changes from the branch have been applied to the main file, but the branch hasn’t been closed. |
If all your changes have been successfully applied, you can archive the branch. |
|
Not all changes from the branch are applied to the main file. |
Restore the main file ↓ to a version before the failed merge. Then repeat the merge process. |
|
You accidentally merged changes from a branch, or want to undo your changes. |
Restore an earlier version of a branch
Tip! You can identify a branch by looking out for this structure in the toolbar:
File name Branch name
-
Make sure you have the branch open.
-
Click on an empty spot in the canvas to deselect any layers.
- In the toolbar, click next to the file name.
- Select Show Version History.
- In the right sidebar, click next to the “Before update” checkpoint.
- Click next to the version name and select Restore this version.
- Click Done in the toolbar to exit version history.
Restore an earlier version of the main file
Caution: Restoring a previous version applies to everyone with access to the main file. This won’t preserve any other changes made to the main file, including other branch merges.
Note: Reversing or undoing a merge won’t restore an archived branch. You’ll need to restore the branch before trying to merge the branch again.
- From the main file, click the next to the file name in the toolbar.
- Select Show version history to open version history in the right sidebar.
- You can identify a merged branch with the Branch merge icon.
- Select a version before the merged branch. This could be the “Before merge” checkpoint or any other checkpoint.
- Click next to the version and select Restore this version.
- Click Done in the toolbar to exit version history.
View a file's version history →
Restore an archived branch
- Click the file/branch name in the toolbar.
- Select See all branches to open the branches modal.
- Select the Archived tab to view any archived branches.
- Click next to the branch you want to restore and select Restore.
- You can then switch to the Active tab, hover over the branch and click Open.