The changes that can't be done by Subversion while merge are also shown in this view and can be merged or skipped manually. If the option of interactive merge is enabled then the merge results are shown in the 'SVN Merge View'. So the edit conflicts action must be run to resolve conflicts. Then three file are created: 'name'.tmp (copy of the user's local file before update), 'name'.tmp2 (copy of the first revision file) and 'name'.tmp3 (copy of the second revision file). If there were some conflicts during the merge operation cycle SVN® merges what it can and notify the user about the conflict. The Merge Dialog will appear and to perform operation user should follow its instructions and fill needed properties. Screenshot See the screenshots page for more screenshots. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.

To start merging click 'Team>Merge.' menu item of the resource pop-up menu, 'Merge.' menu item of the SVN main menu group or on the 'Merge.' button on the 'SVN Toolbar'. WinMerge is an Open Source differencing and merging tool for Windows. Merging means creating a version by blending different revisions of resources.

Eclipse winmerge svn