On Wednesday, 26 March 2014 17:52:13 UTC-6, Ralf Hemmecke wrote: > > I have not personally used it (so I might be wrong), but I somehow feel > that git-rerere might be of some help. As I understand, you basically > want to see exactly what your merge resolution was. > > http://git-scm.com/blog/2010/03/08/rerere.html > > Ralf > > And this one looks like a useful tool to avoid extra merges for an invasive branch that takes a lot of time, although given recompilation time even with ccache it may be more convenient to merge from time to time.
Andrey > On 03/27/2014 12:31 AM, Andrey Novoseltsev wrote: > > Hello, > > > > I have just merged current "develop" into a branch abandoned half a year > > ago (http://trac.sagemath.org/ticket/15240). I think I've resolved > > conflicts correctly, but once everything is committed - how can I review > > what exactly have I done during the merge? I.e. how can see just the > hunks > > that I had to edit/approve manually during the merge? Clicking on the > > branch on trac seems to show the difference between the current state > and > > the branch, which looks OK, but since there are many changes it is hard > to > > say anything about the merge. Clicking on the last merge commit, on the > > other hand, shows changes to the whole library and is useless. > > > > Thank you! > > Andrey > > > -- 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. For more options, visit https://groups.google.com/d/optout.
