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 . 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. I completely agree with the rest of your mail, though. -Keshav -- 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.
