Re: `git merge --no-overwrite-ignore` overwrites ignored files when merge (i.e. not fast-forward)
- From
Han Jiang <jhcarl0814@gmail.com>
- Date
- Sep 4, 2024, 11:03 UTC
- Message-ID
- <CANrWfmQpUFCkDrdC7k7pMVSY+jow6hePNcd0324PH=T9-WwHsA@mail.gmail.com>
- In-Reply-To
- <CABPp-BEwLYhfBN6esMdeTcby4=12zhFeSqrih-WPy8D+pW3sxQ@mail.gmail.com>
(https://lore.kernel.org/git/CABPp-BEg6vxiUp/ says: Message-ID <CABPp-BEg6vxiUp> not found) Many thanks to your leading me to the "Precious Files Design Document" and all the other links! The document reveals that untracked files would better be further subdivided and explains the meaning of each category. Really clear and understandable! Turns out that the support of --[no-]overwrite-ignore is not enough (only works with the fast-forwarding backend), so maybe users have to wait until they deal with all those issues in a unified way.
On Wed, Sep 4, 2024 at 11:19 AM Elijah Newren <newren@gmail.com> wrote:
Show 30 quoted lines
> > On Sun, Sep 1, 2024, 03:49 Han Jiang <jhcarl0814@gmail.com> 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/