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

Re: git overwriting local ignored files?

From
KKKonstantin Khomoutov <kostix@bswap.ru>
Date
Nov 24, 2018, 15:41 UTC
Message-ID
<20181124154132.co3lo27wy25i4v47@tigra>
In-Reply-To
<20181124145723.ow2h7x374xwwts6m@tigra>
On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote:
Show 13 quoted lines
> On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote:
> 
> > > > It seems that git is overwriting my local files on merge if they're in
> > > > .gitignore.
> [...]
> > > The .gitignore file is to list "ignored and expendable" class of
> > > files; there is no "ignored but precious class" in Git.
> > Ok. Would a patch be welcome? I have three ideas for how to implement it,
> > and I'm not sure which is better.
> [...]
> 
> You might want to first investigate this recent thread [1] which AFAIK
> was dedicated to exactly this problem.

Well, actually the thread is old, but its continuation [2] is recent. The crux is that it discusses certain approaches to solve the apparent problem and patches to do that.

1. https://public-inbox.org/git/4C6A1C5B.4030304@workspacewhiz.com/
2. https://public-inbox.org/git/871s8qdzph.fsf@evledraar.gmail.com/
Previous: Konstantin KhomoutovNext: David Mandelberg
Message 5 of 6 in “git overwriting local ignored files?”
  1. David MandelbergNov 24, 2018
  2. Junio C HamanoNov 24, 2018
  3. David MandelbergNov 24, 2018
  4. Konstantin KhomoutovNov 24, 2018
  5. Konstantin KhomoutovNov 24, 2018
  6. David MandelbergNov 25, 2018

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.