Merge resolution
About this task
If conflicts occur during a deliver or rebase operation and cannot be resolved automatically, use the GitView web interface to resolve them.
Procedure
- Open the Merge Conflict screen in the GitView UI.
- Review each conflicting file and select the appropriate changes, or edit the file directly.
- Save the resolved files.
- After all conflicts are resolved, complete the deliver or rebase operation.