[FFmpeg-devel] Confusing git merges

[David Woodhouse]

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...

-- 
dwmw2