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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html