* Per-file force update
@ 2007-01-25 17:17 Troy Telford
2007-01-25 17:22 ` Shawn O. Pearce
2007-01-26 13:02 ` Jakub Narebski
0 siblings, 2 replies; 3+ messages in thread
From: Troy Telford @ 2007-01-25 17:17 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Per-file force update
2007-01-25 17:17 Per-file force update Troy Telford
@ 2007-01-25 17:22 ` Shawn O. Pearce
2007-01-26 13:02 ` Jakub Narebski
1 sibling, 0 replies; 3+ messages in thread
From: Shawn O. Pearce @ 2007-01-25 17:22 UTC (permalink / raw)
To: Troy Telford; +Cc: git
Troy Telford <ttelford.groups@gmail.com> 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?
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Per-file force update
2007-01-25 17:17 Per-file force update Troy Telford
2007-01-25 17:22 ` Shawn O. Pearce
@ 2007-01-26 13:02 ` Jakub Narebski
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Narebski @ 2007-01-26 13:02 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-01-26 13:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-25 17:17 Per-file force update Troy Telford
2007-01-25 17:22 ` Shawn O. Pearce
2007-01-26 13:02 ` Jakub Narebski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.