When you use a version control system, you might need to merge changes you made to a file with changes made to the same file by someone else. When you update a locally modified file, CVS automatically merges changes from the repository with changes made to your local file. But when conflicts occur, you must decide how to resolve each conflict before you can check your local file into the repository.
You can resolve merge conflicts:
To resolve merge conflicts through the Merge Conflicts Resolver:
The Merge Conflicts Resolver is displayed. Merge conflicts are highlighted in red. The icons in the upper-lefthand corner allow you to move through the conflicts in the file.
If neither pane has the text you want, open your source
file and edit it. When you are done making
changes, right-click the node of your source
file and choose
CVS
Update
from the contextual menu. Then repeat Step 1 in this section.
The text you chose is now highlighted in green and is displayed in the Merge Result pane. The text in the pane you did not choose is highlighted in blue.
![]() |
To change the background highlight colors that the
Merge Conflicts Resolver uses, choose
Tools
Options. Expand IDE Configuration
Server and External Tools Settings.
Expand Diff and Merge Types
Merge Visualizers. Select Graphical Merge Conflicts Resolver and select
the setting you want to change. Click
the ellipsis button (...) to choose a color
from a color palette.
|
| See also | |
|---|---|
|
Merging File Revisions |
|