From: Michael Meeks <michael.meeks@novell.com>
Date: Tue, 22 Feb 2011 18:14:39 GMT
Subject: Re: libreoffice merge(tool?) issue #3 ...
Message-ID: <1298398479.32648.184.camel@lenovo-w500>
In-Reply-To: <4D63F2C5.2080505@drmicha.warpmail.net>

Hi Michael,

On Tue, 2011-02-22 at 18:30 +0100, Michael J Gruber wrote:
> I get thousands of conflicts. Have the branches moved since your post?
> It may be better to give us sha1 or stable tags.

	Nope; there are thousands of conflicts; a subset of these are (I would
like to think ;-) erroneous; but I'm picking out individual files with
problems that I can repeat easily and that have (I hope) simple history
to try to isolate the problems for you.

> Are you doing any builds before merging?

	Builds of what ? git - no; LibreOffice - sure, it builds before the
merge - and then there is a huge slew of work to do to make it build
afterwards ;-) but then that is not so suprising.

	Anyhow - thanks for looking at it; can you replicate the suprising
result in that file: ucb/source/ucp/ext/makefile.mk ? what does
'refusing to loose untracked file' mean in that context ?

	Thanks,

		Michael.

-- 
 michael.meeks@novell.com  <><, Pseudo Engineer, itinerant idiot