You can change branches in your workspace by selecting a branch from the menu.
The menu lists a maximum of ten local branches followed by remote branches, in alphabetical order. If your repositories have more than ten branches, you can search for additional branches.
When you pull the latest changes from remote to your workspace, Domino fetches the latest content from the remote branch (git fetch), then applies your changes on top of the updated branch (git rebase). When files conflict, you can resolve conflicts manually or use remote changes. Use Remote Changes discards changes in your workspace and overwrites files in your workspace with remote changes.
Merge conflicts occur when changes are made to the same line of a file, or when one person edits a file and another person deletes the same file. They can also happen when you push multiple commits. You can resolve merge conflicts in your workspace through a guided application for both the main code repository and any additional imported repositories. If you were making multiple commits, the latest commit might overwrite changes that you made during conflict resolution.
If you are working in a Git-based project and sync some files, you might run into a merge conflict. When this occurs, the File Conflicts window opens.
Select Resolve Manually to resolve conflicts by the filename.
For each file in conflict, you can Mark as resolved, Use my changes or Use origin repo changes:
-
Mark as resolved means that you’ve edited the files to resolve conflict markers. The latest change of the file is listed under Uncommitted changes and will be pushed to remote when you click Continue sync.
-
Use my changes overwrites remote files with changes in your workspace. The latest change of the file is listed under Uncommitted changes and will be pushed to remote when you click Continue sync.
-
Use origin repo changes discards changes in your workspace and overwrites the file with remote changes. The file are not listed under Uncommitted changes because there is no change to commit. However, you must click Continue sync to complete the conflict resolution.
|
Important
| All files in Artifacts are saved exclusively to the Domino File System (DFS). If you do not want to save a particular asset to the Domino File System, Domino recommends that you do not save it as an artifact. See Sync Changes. |
Artifacts are results from your research, like plots, charts, serialized models, and more. In Domino, you can save these results in the Artifacts section of your project.