In your scenario, .mine should be left, .r35 should be right, .r33 should be ancestor and the original should be merge.
If you don't see the latter two options in the filemerge open dialog take the resize handle on the window and drag down :) Then use cmd+d to go to the first/next conflict and use the dropdown at bottom-right to choose which to put in the final file. You can choose one or the other or both and choose which is added first. HTH Sent from my iPhone On Jun 16, 2009, at 5:16 PM, travisjbeck <[email protected]> wrote: > > I've seen several messages about conflicts posted to this group, but > none seem to answer my questions about how to handle them. > > here's the scenario: > I've made changes to a application.js file. > i do a pre-commit update. > SVN notices a conflict with the js file because someone else has > edited the same js file and commited the changes. > now i have the following files: > a conflicted application.js file with '>>>>>>' markers and is > essentially a file with all the code duplicated with those markers > > application.js.mine (my changes) > application.js.r33 > application.js.r35 > > no matter what i do with filemerge i cannot get it to actually merge > the differences correctly into a new file. > > is this just broken or am i doing something wrong? > > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~----------~----~----~----~------~----~------~--~---
