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?

Thanks,
-- 
Troy Telford
-
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