Hi Lucas,
On Mi, 23 Jan 2013, Lucas Beeler 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
Sorry, I checked ... no it is different ... you merged master
and fixed the errors.
*this*is*not*good*!
Try calling
git merge master
on the faces branch!
It tries to rewind the not contained commits, the old old ones, on top,
which does not work out.
We have to get *rid* of the old history to make that work.
The big problem is 4d964efc335b343d31a590d401ee1b85dca3c3ea
which contains too much.
???
THat is te reason why I send/uploaded *one* single patch that should
be used to create a *new* faces branch based on current head,
otherwise we wil never be able to merge.
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
