{"version":"2.0.60","anchor":"git-rebase-merge-state-detection","canonical_anchor":"git-rebase-merge-state-detection","heading":"Git Rebase\/Merge State Detection","tier":null,"area":null,"scope":null,"heads_up":null,"url":"https:\/\/changelogs.core-directive.com\/v\/2.0.60\/e\/git-rebase-merge-state-detection","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.0.60","markdown":"### Git Rebase\/Merge State Detection\n\n**What:** Claude now detects when git is in the middle of a rebase, merge, cherry-pick, or revert operation and skips the diff display to avoid confusing partial state.\n\n**Details:**\n\n- Added `rm5()` function at line 405566 that checks for git state files:\n- `MERGE_HEAD` - merge in progress\n- `REBASE_HEAD` - rebase in progress\n- `CHERRY_PICK_HEAD` - cherry-pick in progress\n- `REVERT_HEAD` - revert in progress\n- The `ky2()` function at line 405477 now calls `rm5()` and returns early if any state file exists\n- **Evidence**: New function added at line 16108, integration at line 17927"}