From: Geoff Russell <geoffrey.russell@gmail.com>
Date: Mon, 18 May 2009 02:30:46 GMT
Subject: Merging a branch when I don't want conflicts
Message-ID: <93c3eada0905171930m36765d4fued9c2efdc57e51a4@mail.gmail.com>

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.

Cheers,
Geoff