From 610b94b8705d3cd18d8984a6c736157aa9b04b1c Mon Sep 17 00:00:00 2001 From: Marius1311 Date: Fri, 9 Oct 2026 17:15:11 +0200 Subject: [PATCH] Catch conflict markers left by cruft update check-merge-conflict only looks while a git merge is in progress, and cruft update applies its patch outside one, so leftover markers were committed unnoticed. Also indent .cruft.json as cruft writes it. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Vtrv52oTpCLDMKzN13i4Nw --- {{cookiecutter.project_name}}/.editorconfig | 2 +- {{cookiecutter.project_name}}/.pre-commit-config.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_name}}/.editorconfig b/{{cookiecutter.project_name}}/.editorconfig index 4e00f8f..66678e3 100644 --- a/{{cookiecutter.project_name}}/.editorconfig +++ b/{{cookiecutter.project_name}}/.editorconfig @@ -8,7 +8,7 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -[*.{yml,yaml,toml}] +[{*.{yml,yaml,toml},.cruft.json}] indent_size = 2 [Makefile] diff --git a/{{cookiecutter.project_name}}/.pre-commit-config.yaml b/{{cookiecutter.project_name}}/.pre-commit-config.yaml index 2e25aec..acdcb61 100644 --- a/{{cookiecutter.project_name}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_name}}/.pre-commit-config.yaml @@ -34,6 +34,7 @@ repos: - id: trailing-whitespace - id: check-case-conflict - id: check-merge-conflict + args: [--assume-in-merge] # cruft update leaves conflict markers outside any git merge - repo: local hooks: - id: forbid-rej