{"version":"2.1.290","anchor":"git-special-file-list-adds-merge-rr-and-merge-autostash","canonical_anchor":"git-special-file-list-adds-merge-rr-and-merge-autostash","heading":"Two more git merge files are on Claude Code's list of git's own files","tier":"notice","area":"Git","scope":"individual","heads_up":false,"url":"https:\/\/changelogs.core-directive.com\/v\/2.1.290\/e\/git-special-file-list-adds-merge-rr-and-merge-autostash","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.290","markdown":"### Two more git merge files are on Claude Code's list of git's own files\n\nMERGE_RR and MERGE_AUTOSTASH join MERGE_HEAD and MERGE_MSG on Claude Code's list of git's internal file names\n\n**Unclear.** It is not clear what Claude Code does with this list, for example whether these files are now protected from edits.\n\n**What**\n\nGit, the version control tool, writes some files of its own while it merges changes. Claude Code keeps a list of these file names, which already held `MERGE_HEAD` and `MERGE_MSG`. The list now also holds `MERGE_RR` and `MERGE_AUTOSTASH`.\n\n**Why**\n\nClaude Code now treats two more of git's merge files as git's own files.\n\n- Area: Git\n- Tier: You'll notice\n- Useful: 1\/5\n- Signal: 0\/5\n- Scope: individual\n- Heads-up: no"}