Tuesday, June 26, 2012

Using TortoiseMerge for command line Subversion merging

  1. Create a batch file called svn_tortoisemerge.bat with the following content.
    "c:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe" /base:"%1" /theirs:"%2" /mine:"%3" /merged:"%4"
    
  2. Set the SVN_MERGE environment variable to point to the file.
    set SVN_MERGE=c:\...\svn_tortoisemerge.bat
  3. When merging conflicts use l to launch the editor and r to mark a conflict as resolved.
    Conflict discovered in 'C:/.../somefile'.
    Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options:
    

Via Stack Overflow.

No comments:

Post a Comment