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

Warning about conflict markers - undocumented 'diff --check' feature & suggestion

From
Ori Avtalion <ori@avtalion.name>
Date
Mar 28, 2016, 22:44 UTC
Message-ID
<CALgdb5JuoYpHAPxTY2cHdbkcPUjKtsWQ_DY5rBrw-YKCwj2yvw@mail.gmail.com>
A bug report and a suggestion:

`git diff --check` has been warning about conflict markers since 2008: https://marc.info/?l=git&m=122398500726634&w=2

This is an undocumented feature. The current documentation for the flag only mentions "whitespace errors".

This check will also be useful in `git add`, to prevent accidental staging of conflict markers. Perhaps it could be included, if not by default, then at least with a configuration setting.

Thoughts? Is this perhaps an existing feature that I'm missing? :)
-Ori
Next: Junio C Hamano
Message 1 of 6 in “Warning about conflict markers - undocumented 'diff --check' feature & suggestion”
  1. Ori AvtalionMar 28, 2016
  2. Junio C HamanoMar 28, 2016
  3. Ori AvtalionMar 29, 2016
  4. Junio C HamanoMar 29, 2016
  5. Ori AvtalionMar 29, 2016
  6. Documentation: git diff --check detects conflict markersOri Avtalion, Mar 29, 2016

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.