On Mi, 23 Jan 2013, Lucas Beeler wrote: > This is a good idea and is exactly what I have done. I just completed > the mega-merge of master back onto faces and resolved the conflicts it > created. Master and faces now have a new, up-to-date common ancestor. > Moving forward, let's continue use git merge instead of git rebase.
Great, thanks!!! Comments patch updated ... last item resolved (stripped CRLF). Enjoy Norbert ------------------------------------------------------------------------ PREINING, Norbert http://www.preining.info JAIST, Japan TeX Live & Debian Developer DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094 ------------------------------------------------------------------------ _______________________________________________ Shotwell mailing list [email protected] http://lists.yorba.org/cgi-bin/mailman/listinfo/shotwell
