Skip to main content

Merge Aborted Errors

Error: Merge Aborted

When attempting to merge branches in the Coalesce UI, you may see the following error:

Merge Aborted

When this happens, your Workspace is reset to its state before the merge.

Why This Happens

A merge operation may fail in the following situations:

  • The branches do not share a common base commit
  • The branches share two or more common commits

How To Fix Merge Aborted Errors

If you receive a merge aborted error:

  1. Complete the merge outside of Coalesce using your normal Git workflow or pull request process.
  2. After finishing the merge in your repository, return to Coalesce.
  3. Open the Git modal in your Workspace.
  4. Click Update Branch to pull the latest changes into Coalesce.

Next Steps

If merge issues continue after following these steps, confirm that your repository history is consistent and that merges are completed successfully in your Git provider before syncing changes back to Coalesce.