Differences between svn merge left, right & working files after conflicts

Question

When performing a \'svn merge\' from my development team\'s trunk into a branch, we occasionally experience merge conflicts that produce files with suffix names: *.mer

Answer 1

You performed 3-side merge diring conflict-resolving (when merging 2 different files). It this operation 3 sources used

• "your" file (from WC or source-location, depending on parameters)
• "their" file (file with with changes must be merged)
• "base" file (common ancestor of files 1-2)

r*** extension just added to the same filename in order to have 3 files on merge

After successful merging and marking conflict as resolved temp-files must disappear automagically, if my memory served me well