[FFmpeg-devel] Confusing git merges
Dominik 'Rathann' Mierzejewski
dominik at greysector.net
Mon Mar 21 08:38:26 CET 2011
On Sunday, 20 March 2011 at 10:36, David Woodhouse wrote:
> On Sun, 2011-03-20 at 02:44 +0100, Michael Niedermayer wrote:
> > Well having a local repo and cleaning their stuff up before pulling means work
> > and git would only know it merged the local repo it wouldnt
> > know about the remote ..
> > Thats not looking very convenient to me.
> Yeah. "Ick, please clean that up before I pull it" is definitely the
> better approach...
Yes, but not possible in the current situation (Michael is pulling
from the forked libav tree).
MPlayer http://mplayerhq.hu | RPM Fusion http://rpmfusion.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
-- from "Collected Sayings of Muad'Dib" by the Princess Irulan
More information about the ffmpeg-devel