Troy Telford <ttelford.groups@gmail.com> wrote:
quoted text
> 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.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html