Resolve merge conflicts

You might encounter merge conflicts when you collaborate with colleagues. To resolve merge conflicts, you can use the Git service provider or a terminal.

Resolve conflicts with the Git service provider

When merge conflicts arise, Domino creates a new branch with the conflicts in your repository and pushes them to your Git service provider (such as GitHub or Bitbucket).

  1. Go to your Git service provider.

  2. Use your Git service provider’s application to create a pull request between the newly created branch and your original branch.

  3. Merge the pull request.

  4. Return to Domino.

    Note
    		 Do not pull any changes.

  5. Start a workspace terminal.

  6. Use the following to reset the branch:

    git reset --hard origin/name-of-branch`

    where name-of-branch is the name of your original branch.

  7. Click Pull. Domino pulls the resolved merge conflicts. Your branch is now free of merge conflicts.

Resolve conflicts with a terminal

If you prefer, you can resolve merge conflicts in a workspace terminal. For information about the typical Git workflow to resolve merge conflicts, see Git merge conflicts.