Hi Norbert, You wrote:
> From now on we *could* always do > git merge master > into the faces branch, to keep it uptodate > and easily mergeable back into master. 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. Cheers, Lucas _______________________________________________ Shotwell mailing list [email protected] http://lists.yorba.org/cgi-bin/mailman/listinfo/shotwell
