From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 26 Jan 2007 13:02:13 GMT
Subject: Re: Per-file force update
Message-ID: <epcu2g$vrv$2@sea.gmane.org>
In-Reply-To: <op.tmpzmzvtzidtg1@rygel.lnxi.com>

Troy Telford wrote:

> I've got a file that (due to some inner workings) changes whenever it's  
> built.
> 
> This causes a problem with git, causing merge conflicts.
> 
> Is there a way I can configure git to /always/ do the equivalent of 'git  
> pull -f', but only for that one file?

Ignore this file, using either .gitignore or .git/into/excludes.
You should not track output files in git (well, in principle).
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git