Re: merge strategy request

From: David Lang <david.lang@digitalinsight.com>
Date: Mar 25, 2007, 23:16 UTC
Message-ID: <Pine.LNX.4.63.0703251514060.13765@qynat.qvtvafvgr.pbz>
In-Reply-To: <46a038f90703251634t2ab6a455t382ebe29cdb53667@mail.gmail.com>

On Mon, 26 Mar 2007, Martin Langhoff wrote:

Show 14 quoted lines

> On 3/25/07, Junio C Hamano <junkio@cox.net> wrote:
>> Right.  In the current system, git-mergetool might be a better
>> place to add support for special perpose 3-version file-level
>> merge backend than merge-recursive, at least until gitattributes
>> materializes.
>
> Would it be possible to have an env var (GIT_MERGE) that can be used
> to call an arbitrary script with merge/diff3 semantics instead of
> using the internal 3-way merge? That way we could do syntax-specific
> merges (ignore comments/whitespace, for example).
>
> i would surely have a use for it, as sometimes my internal team is not
> _that_ good about trimming whitespace, and we have merges that succeed
> except for their whitespace conflicts.

would you really want that for _all_ merges, or only for merges of specific file types?

if you want it for all merges you should be able to create a modified version of the current merge and just substatute it in your install.

if you want it only for specific file types (say .c, .h, and .cfg files) then you really want the gitattributes support.

did anyone jump in on that for a soc project?

David Lang