From: David Mandelberg <david@mandelberg.org>
To: Konstantin Khomoutov <kostix@bswap.ru>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: git overwriting local ignored files?
Date: Sat, 24 Nov 2018 21:06:35 -0500 [thread overview]
Message-ID: <89204364-f624-62ec-fbaa-84b5b7ae4099@mandelberg.org> (raw)
In-Reply-To: <20181124154132.co3lo27wy25i4v47@tigra>
On 11/24/18 10:41 AM, Konstantin Khomoutov wrote:
> 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 [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/
Thanks for the pointers, and sorry to start a new thread. It looks like
most of the work to do is in finding consensus on the right way forward,
rather than in writing a patch. While I really would like there be a way
to prevent git from overwriting ignored files, I don't have any strong
opinions on what that way should look like. So I think I'll just wait
and hope somebody else does the work.
--
https://david.mandelberg.org/
prev parent reply other threads:[~2018-11-25 2:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-24 2:35 git overwriting local ignored files? 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
2018-11-25 2:06 ` David Mandelberg [this message]
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=89204364-f624-62ec-fbaa-84b5b7ae4099@mandelberg.org \
--to=david@mandelberg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kostix@bswap.ru \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).