Conrad Parker wrote: > Yup, and in hindsight Erik could have used git rerere to record the > resolutions so they could be replayed during the rebase.
Git rerere is documented here:
http://progit.org/2010/03/08/rerere.html
Erik
--
----------------------------------------------------------------------
Erik de Castro Lopo
http://www.mega-nerd.com/
_______________________________________________
coders mailing list
coders@slug.org.au
http://lists.slug.org.au/listinfo/coders
