That sounds interesting Quinn! The CLI is great, but if I'm already using a GUI app for other reasons, I'd prefer to not have to leave it to get 3-way merging. Still, it sounds like that script could definitely be useful.
If I knew how to derive all three filenames just from the source file having the conflict ( the head and base need revision numbers) then at least I would only have to have one file selected. I'll have to look at how fmresolve does that. Keyboard control of the GUI app would be ideal, though. Being able to navigate to the conflicted file and resolve it using keyboard shortcuts would be the best combination of efficiency (no mouse) and visualization (GUI instead of CLI). Cheers, Chris On Nov 28, 9:29 am, Quinn Taylor <quinntay...@mac.com> wrote: > Versions has always behaved a bit strangely when there is a conflicted file. > Not only does it not support 3-way merging, but it disables the Local Changes > menu/toolbar items as well. I would love to see the diff functionality > extended to allow resolving conflicts via 3-way merge. (Even better, > interactive conflict resolution would also be extremely nice as well.) > > Myself, I use FileMerge (installed with Xcode 3.x) to do 3-way > merges.http://www.defraine.net/~brunod/fmdiff/The 'fmresolve' script feeds > the files in the correct order to FileMerge, and saving writes data to the > original file. I invoke it via Terminal; in the case of your example, it > would be `fmresolve tileEngine*.as` — it picks up the names of the other > files automatically. Slightly easier and/or more convenient than having to > drag multiple files. :-) > > - Quinn > > On Nov 28, 2011, at 5:16 AM, Mike Combs wrote: > > > > > > > > > Chris, your blog entry was terrific and I'm anxious to have to do my next > > 3-way merge to try out your app. I hope Versions incorporates your change. > > Thanks! > > > On 11/27/11 11:10 PM, Chris Ozeroff wrote: > >> Hey everyone, > > >> For those of you interested in custom scripts for Versions, I created > >> a simple app to make it easier to launch a 3-way merge in DiffMerge > >> from Versions. See my blog post here: > > >>http://chrisnchris.wordpress.com/2011/11/22/3-way-merging-using-versi... > > >> And to Black Pixel: Why isn't 3-way merge integration with popular > >> diff tools supported inside the app? Or did I miss where to set that? > > >> Cheers, > > >> Chris > > > -- > > You received this message because you are subscribed to the Google Groups > > "Versions" group. > > To post to this group, send email to versions@googlegroups.com. > > To unsubscribe from this group, send email to > > versions+unsubscr...@googlegroups.com. > > For more options, visit this group > > athttp://groups.google.com/group/versions?hl=en. > > > > smime.p7s > 4KViewDownload -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
