{"thread":{"id":"6526","subject":"Per-file force update","startedAt":"2007-01-25T17:17:13Z","lastAt":"2007-01-26T13:02:13Z","messageCount":3,"participants":["Troy Telford","Shawn O. Pearce","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"32626","messageId":"op.tmpzmzvtzidtg1@rygel.lnxi.com","threadId":"6526","inReplyTo":null,"subject":"Per-file force update","fromName":"Troy Telford","fromEmail":"ttelford.groups@gmail.com","sentAt":"2007-01-25T17:17:13Z","receivedAt":"2007-01-25T17:17:13Z","isPatch":false,"sender":{"key":"ttelford.groups@gmail.com","avatar":"https://gravatar.com/avatar/7fb1a08052bfe7645125d4c1bcd6d8f58b780239c783f9064f341831d9456049?d=mp&s=160"},"body":"I've got a file that (due to some inner workings) changes whenever it's  \nbuilt.\n\nThis causes a problem with git, causing merge conflicts.\n\nIs there a way I can configure git to /always/ do the equivalent of 'git  \npull -f', but only for that one file?\n\nThanks,\n-- \nTroy Telford\n"},{"id":"32627","messageId":"20070125172226.GB13089@spearce.org","threadId":"6526","inReplyTo":"op.tmpzmzvtzidtg1@rygel.lnxi.com","subject":"Re: Per-file force update","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-01-25T17:22:26Z","receivedAt":"2007-01-25T17:22:26Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Troy Telford <ttelford.groups@gmail.com> wrote:\n> I've got a file that (due to some inner workings) changes whenever it's  \n> built.\n> \n> This causes a problem with git, causing merge conflicts.\n> \n> Is there a way I can configure git to /always/ do the equivalent of 'git  \n> pull -f', but only for that one file?\n\nTake the file out of the repository.  If its being rebuilt everytime\nyou build, why are you tracking it in Git?\n\nGit is for tracking *sources*.  That file sounds like its an output,\nwhich shouldn't be tracked.\n\n-- \nShawn.\n"},{"id":"32732","messageId":"epcu2g$vrv$2@sea.gmane.org","threadId":"6526","inReplyTo":"op.tmpzmzvtzidtg1@rygel.lnxi.com","subject":"Re: Per-file force update","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-01-26T13:02:13Z","receivedAt":"2007-01-26T13:02:13Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Troy Telford wrote:\n\n> I've got a file that (due to some inner workings) changes whenever it's  \n> built.\n> \n> This causes a problem with git, causing merge conflicts.\n> \n> Is there a way I can configure git to /always/ do the equivalent of 'git  \n> pull -f', but only for that one file?\n\nIgnore this file, using either .gitignore or .git/into/excludes.\nYou should not track output files in git (well, in principle).\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"}]}