Re: first-class conflicts?

From: Sandra Snan <sandra.snan@idiomdrottning.org>
Date: Nov 11, 2023, 07:48 UTC
Message-ID: <87wmuohgsi.fsf@ellen.idiomdrottning.org>
In-Reply-To: <xmqqh6ltrs6t.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

> Correct but with a caveat: it is too easy for lazy folks to 
> circumvent the safety by mistake with "commit -a".

Lazy and ignorant like myself because I didn't know -a was that dangerous. Thank you both!

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.