{"thread":{"id":"63210","subject":"[PATCH] merge-file doc: set conflict-marker-size attribute","startedAt":"2025-03-28T14:45:43Z","lastAt":"2025-03-29T23:36:48Z","messageCount":2,"participants":["Phillip Wood via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"515235","messageId":"pull.1895.git.1743173140253.gitgitgadget@gmail.com","threadId":"63210","inReplyTo":null,"subject":"[PATCH] merge-file doc: set conflict-marker-size attribute","fromName":"Phillip Wood via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-03-28T14:45:40Z","receivedAt":"2025-03-28T14:45:43Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nWhen committing a conflict resolution for a merge containing\n1f010d6bdf7 (doc: use .adoc extension for AsciiDoc files, 2025-01-20)\nmy pre-commit hook failed because \"git diff --check\" thought there was\na left over conflict marker in \"merge-file.adoc\". Fix this by setting\nthe \"conflict-marker-size\" attribute as we do for all the other\ndocumentation files that contain example conflict markers.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n    merge-file doc: set conflict-marker-size attribute\n    \n    Grepping around I can't find any other files with conflict markers\n    without this attribute set. (If there were I think my pre-commit hook\n    would have complained about them as well)\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1895%2Fphillipwood%2Fmerge-file-doc-attributes-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1895/phillipwood/merge-file-doc-attributes-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1895\n\n .gitattributes | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/.gitattributes b/.gitattributes\nindex c6a0b35116f..32583149c2f 100644\n--- a/.gitattributes\n+++ b/.gitattributes\n@@ -13,6 +13,7 @@ CODE_OF_CONDUCT.md -whitespace\n /mergetools/* text eol=lf\n /t/oid-info/* text eol=lf\n /Documentation/git-merge.adoc conflict-marker-size=32\n+/Documentation/git-merge-file.adoc conflict-marker-size=32\n /Documentation/gitk.adoc conflict-marker-size=32\n /Documentation/user-manual.adoc conflict-marker-size=32\n /t/t????-*.sh conflict-marker-size=32\n\nbase-commit: a36e024e989f4d35f35987a60e3af8022cac3420\n-- \ngitgitgadget\n"},{"id":"515287","messageId":"xmqqv7rrbe9e.fsf@gitster.g","threadId":"63210","inReplyTo":"pull.1895.git.1743173140253.gitgitgadget@gmail.com","subject":"Re: [PATCH] merge-file doc: set conflict-marker-size attribute","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-03-29T23:36:45Z","receivedAt":"2025-03-29T23:36:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Phillip Wood via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Phillip Wood <phillip.wood@dunelm.org.uk>\n>\n> When committing a conflict resolution for a merge containing\n> 1f010d6bdf7 (doc: use .adoc extension for AsciiDoc files, 2025-01-20)\n> my pre-commit hook failed because \"git diff --check\" thought there was\n> a left over conflict marker in \"merge-file.adoc\". Fix this by setting\n> the \"conflict-marker-size\" attribute as we do for all the other\n> documentation files that contain example conflict markers.\n>\n> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n> ---\n>     merge-file doc: set conflict-marker-size attribute\n>     \n>     Grepping around I can't find any other files with conflict markers\n>     without this attribute set. (If there were I think my pre-commit hook\n>     would have complained about them as well)\n\nWell spotted.  \"git grep -n '^<<<<<<<'\" tells me that the\ngit-merge-file, git-merge, and user-manual require them, but this\nwas a rather old line dating back from 2008, so it is a bit\nsurprising nobody caught it before.\n\nWill queue.  Thanks.\n"}]}