From: Konstantin Khomoutov <firstname.lastname@example.org> To: David Mandelberg <email@example.com> Cc: Junio C Hamano <firstname.lastname@example.org>, email@example.com Subject: Re: git overwriting local ignored files? Date: Sat, 24 Nov 2018 18:41:32 +0300 [thread overview] Message-ID: <20181124154132.co3lo27wy25i4v47@tigra> (raw) In-Reply-To: <20181124145723.ow2h7x374xwwts6m@tigra> On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote: > 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  which AFAIK > was dedicated to exactly this problem. Well, actually the thread is old, but its continuation  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.firstname.lastname@example.org/ 2. https://email@example.com/
next prev parent reply other threads:[~2018-11-24 15:41 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 2018-11-24 15:41 ` Konstantin Khomoutov [this message] 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: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181124154132.co3lo27wy25i4v47@tigra \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: git overwriting local ignored files?' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * 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: https://80x24.org/mirrors/git.git 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).