From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 25 Jan 2007 17:22:26 GMT
Subject: Re: Per-file force update
Message-ID: <20070125172226.GB13089@spearce.org>
In-Reply-To: <op.tmpzmzvtzidtg1@rygel.lnxi.com>

Troy Telford <ttelford.groups@gmail.com> 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?

Take the file out of the repository.  If its being rebuilt everytime
you build, why are you tracking it in Git?

Git is for tracking *sources*.  That file sounds like its an output,
which shouldn't be tracked.

-- 
Shawn.