From: Elijah Newren Date: Tue, 03 Sep 2024 23:19:00 GMT Subject: Re: `git merge --no-overwrite-ignore` overwrites ignored files when merge (i.e. not fast-forward) Message-ID: In-Reply-To: On Sun, Sep 1, 2024, 03:49 Han Jiang wrote: > > Thank you for filling out a Git bug report! > Please answer the following questions to help us understand your issue. > > What did you do before the bug happened? (Steps to reproduce your issue) > > (`git merge --no-overwrite-ignore` overwrites ignored files when merge > with conflict.) > > (`git merge --no-overwrite-ignore` overwrites ignored files when merge > without conflict.) Yep, well-known issue that I've mentioned multiple times. Somewhat related to the "precious" concept that has come up on the list a few times. See e.g. * the "merge backends" section of https://lore.kernel.org/git/pull.1627.git.1703643931314.gitgitgadget@gmail.com/ * C2-C7 of https://lore.kernel.org/git/CABPp-BEg6vxiUp * affects cherry-pick too, with discussion of how merge is affected: https://lore.kernel.org/git/CABPp-BG=pm8gfRZNW8Rk1V77s40Do1FZy0mxH6epubHbzF8U5w@mail.gmail.com/ * merge and other shortcomings mentioned when fixing up default handling of ignored files: https://lore.kernel.org/git/b7fe354effff8da3de53bd9cc40a03b5fd455f67.1632760428.git.gitgitgadget@gmail.com/ * wider discussion of correctly removing or keeping files (also discussing merge), in a series fixing lots of bugs in the area: https://lore.kernel.org/git/pull.1036.v3.git.1632760428.gitgitgadget@gmail.com/