git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] git-prompt: show presence of unresolved conflicts at command prompt

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 15, 2022, 04:22 UTC
Message-ID
<xmqqy1vq3zm3.fsf@gitster.g>
In-Reply-To
<CAGTqyRw-SYDbQy9aktq5s3ZhoDhUOCf-pEopjH9m7v5+PH7Qqg@mail.gmail.com>
Justin Donnelly <justinrdonnelly@gmail.com> writes:
> I hope this is against protocol/etiquette, but after some initial
> feedback from Junio, I haven't gotten any more. I wasn't sure if
> nobody had seen the patch, or if there just wasn't any interest.

It probably is a bit of both. I personally did not see much point in adding the long "conflicts" marker to the shell prompt (I did worry about possible complaints by end users triggered by seeing them suddenly without asking, which was why I commented on the patch) and I was waiting for interested folks to speak out.

I do not know about other folks if they did see and did not find it interesting, they are not looking at others' work, or your second round came on a particularly bad day (busy with other topics, or weekend just before the list was swamped with many new topics at the beginning of a new week, or something). Pinging on the thread like you did would be the right thing to do to "kick" those, who did see and who were in favor but who kept silent, into action ;-)

Previous: Justin DonnellyNext: Johannes Schindelin
Message 8 of 17 in “git-prompt: show 'CONFLICT' indicator at command prompt”
  1. git-prompt: show 'CONFLICT' indicator at command promptJustin Donnelly via GitGitGadget, Jul 26, 2022
  2. Junio C HamanoJul 27, 2022
  3. Justin DonnellyJul 28, 2022
  4. Junio C HamanoJul 28, 2022
  5. Justin DonnellyJul 28, 2022
  6. git-prompt: show presence of unresolved conflicts at command promptJustin Donnelly via GitGitGadget, Jul 29, 2022
  7. Justin DonnellyAug 14, 2022
  8. Junio C HamanoAug 15, 2022
  9. Johannes SchindelinAug 15, 2022
  10. Justin DonnellyAug 16, 2022
  11. Phillip WoodAug 15, 2022
  12. Junio C HamanoAug 15, 2022
  13. Justin DonnellyAug 16, 2022
  14. Justin DonnellyAug 16, 2022
  15. git-prompt: show presence of unresolved conflicts at command promptJustin Donnelly via GitGitGadget, Aug 17, 2022
  16. Johannes SchindelinAug 19, 2022
  17. Junio C HamanoAug 19, 2022

Read the whole thread, see it on lore, or plain text.

$ 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.