git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Per-file force update

From
Shawn O. Pearce <spearce@spearce.org>
Date
Jan 25, 2007, 17:22 UTC
Message-ID
<20070125172226.GB13089@spearce.org>
In-Reply-To
<op.tmpzmzvtzidtg1@rygel.lnxi.com>
Troy Telford <ttelford.groups@gmail.com> wrote:
Show 7 quoted lines
> 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.
Previous: Troy TelfordNext: Jakub Narebski
Message 2 of 3 in “Per-file force update”
  1. Troy TelfordJan 25, 2007
  2. Shawn O. PearceJan 25, 2007
  3. Jakub NarebskiJan 26, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.