On Fri, Feb 1, 2013 at 1:38 PM, Keshav Kini <keshav.k...@gmail.com> wrote: > Robert Bradshaw <rober...@math.washington.edu> writes: >> (4) Perhaps I could configure things differently, but littering my >> directory with reject files when things don't apply cleanly vs. git's >> inline >> >> <<<<<< OLD >> ... >> ======== >> ... >>>>>>>> NEW >> >> is so much easier to deal with (as well as being a lot safer in making >> sure nothing was omitted). > > I agree that this is better, but IMHO a nicer solution than either of > these is using an actual three-way merge resolution tool such as kdiff3 > or vimdiff or meld or whatever. You can do this with `git mergetool` and > a little configuration in ~/.gitconfig .
While I have occasionally found such tools useful for visualizing a complicated merge, I actually prefer git's markup in an editor of my choice. > Of course there's similar > functionality in Mercurial as well, though you need to do a little more > configuration to get it to work, in my experience. Yes, but we don't do merges in our current workflow, so it's just a patch that (sometimes partially) fails to apply (though I'm sure there's some graphical tool that would make the rebase less painful, assuming you can pinpoint the point in time (and necessary dependencies) where the patch applied cleanly). - Robert -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
