From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 18 May 2009 06:18:46 GMT
Subject: Re: Merging a branch when I don't want conflicts
Message-ID: <4A10FDC6.2040706@viscovery.net>
In-Reply-To: <93c3eada0905171930m36765d4fued9c2efdc57e51a4@mail.gmail.com>

Geoff Russell schrieb:
> How do I merge a branch X into my master and tell git that whenever there
> is a conflict, the file on X should prevail?  This is for a scripted
> application.

I assume you talk about file-level (content) merges.

There is no such tool, and the reason is that what you try to do here does
not make sense *in general*. It must be a very special kind of project
where you can blindly trust one side over the other if there are
conflicts, and that you can additionally trust non-conflicting content merges.

The best you can do is perhaps to pipe conflicting files through

    sed -e '/^<<<<<<</,/^=======/d' -e '/^>>>>>>>/d'

-- Hannes