Re: git-merge ignore specific files

From: Jakub Narebski <jnareb@gmail.com>
Date: Nov 6, 2007, 13:03 UTC
Message-ID: <fgpong$fmn$1@ger.gmane.org>
In-Reply-To: <174134.11501.qm@web55007.mail.re4.yahoo.com>

Bill Priest wrote:

Show 6 quoted lines

> All,
>   I have two branches that are slightly different and
> most changes "belong" in both.  There are a handful of
> files/directories that are disparate.  Is there any
> way in git to tell it not to merge these files?  Kind
> of like .gitignore but for merges.

Most probably you can use gitattributes for that. Or you can use 'our' merge strategy.

Show 6 quoted lines

>   In addition I'd like a way to specify to git-merge
> to leave all merged files unrecorded in the index. 
> Then as I go through each file making sure that the
> merge "makes sense" (not that git did the right thing;
> but that I want the changes in both branches) that I
> add the change to the index.

You can use gitattributes for that.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git