From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 18 May 2009 09:01:56 GMT
Subject: Re: Merging a branch when I don't want conflicts
Message-ID: <4A112404.6060004@viscovery.net>
In-Reply-To: <93c3eada0905180105n641614eodb0469dceca20bc9@mail.gmail.com>

Geoff Russell schrieb:
> The file is data coming out of an interactive program which reads
> the entire file, edits and then writes the entire file at which point
> this file is correct
> and all previous versions are obsolete.  I don't really want a merge
> at all, but just
> want to replace the file in the master with the version on the branch.

Ah, so finally you say what you mean ;)

You can define a custom merge driver that always returns the content of
the second branch. See 'man gitattributes'.

-- Hannes