list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Konstantin Khomoutov <>
To: David Mandelberg <>
Cc: Junio C Hamano <>,
Subject: Re: git overwriting local ignored files?
Date: Sat, 24 Nov 2018 17:57:24 +0300	[thread overview]
Message-ID: <20181124145723.ow2h7x374xwwts6m@tigra> (raw)
In-Reply-To: <>

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.


  reply	other threads:[~2018-11-24 14:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-24  2:35 David Mandelberg
2018-11-24  4:22 ` Junio C Hamano
2018-11-24 14:37   ` David Mandelberg
2018-11-24 14:57     ` Konstantin Khomoutov [this message]
2018-11-24 15:41       ` Konstantin Khomoutov
2018-11-25  2:06         ` David Mandelberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181124145723.ow2h7x374xwwts6m@tigra \ \ \ \ \
    --subject='Re: git overwriting local ignored files?' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).