Merge Conflicts
From RAD Studio XE
Go Up to How To Use Subversion in the IDE
The merge views appear when a merge conflict occurs during an Update. They can also be used from the Commit dialog to resolve a conflict, caused when you choose to leave conflicts in the file.
When a Merge Conflict dialog appears, you have 4 choices:
- Use your local file, overwriting the one from the server, which will be ignored.
- Use the file from the server, overwriting your local file.
- Merge where possible, but leave any remaining conflicts in the file. This option is not available for .dproj/.cbproj files. If an user would be allowed to select this option for project files then the project would fail to load.
- If there is a default merge viewer installed, you can choose it to solve the conflict. If there isn't one, this option will be hidden.
After selecting an option, press the OK button to solve the conflict.