You might encounter merge conflicts when you collaborate with colleagues. To resolve merge conflicts, you can use the Git service provider or a terminal.
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).
-
Go to your Git service provider.
-
Use your Git service provider’s application to create a pull request between the newly created branch and your original branch.
-
Merge the pull request.
-
Return to Domino.
Note -
Start a workspace terminal.
-
Use the following to reset the branch:
git reset --hard origin/name-of-branch`
where
name-of-branchis the name of your original branch. -
Click Pull. Domino pulls the resolved merge conflicts. Your branch is now free of merge conflicts.
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.