Re: Merging a branch when I don't want conflicts

On Mon, May 18, 2009 at 6:31 PM, Johannes Sixt [off-list ref] wrote:

Geoff Russell schrieb:

quoted

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

Sorry for the confusion. A custom merge driver will work fine ... but I
will also rethink carefully  what I am doing.

Cheers,
Geoff.