Re: Merging and parents

On Tue, 5 Jul 2005, Matthias Urlichs wrote: > > I just had this ugly merge situation: > > M > |\ > | \ > A B > |\/| > |/\| > C D > | / > |/ > E > > Suppose both the EC and the ED branch add files (not with conflicting > filenames!) which then get modified somewhere between C/D and M

Merging and parents

I just had this ugly merge situation: M |\ | \ A B |\/| |/\| C D | / |/ E Suppose both the EC and the ED branch add files (not with conflicting filenames!) which then get modified somewhere between C/D and M. No matter which node gets picked as the parent, some files will end up as "