{"version":"2.1.280","anchor":"merge-conflict-backup-file-patterns-generalized","canonical_anchor":"merge-conflict-backup-file-patterns-generalized","heading":"Merge-conflict backup file patterns generalized","tier":"notice","area":"File Handling","scope":null,"heads_up":null,"url":"https:\/\/changelogs.core-directive.com\/v\/2.1.280\/e\/merge-conflict-backup-file-patterns-generalized","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.280","markdown":"### Merge-conflict backup file patterns generalized\n\nClaude Code now recognizes more merge-conflict backup file variants like .BACKUP_*, .BASE_*, .LOCAL_*, and .REMOTE_*\n\n**Unclear.** The finding doesn't say which specific feature (file watching, search exclusion, or something else) consumes these patterns.\n\n**What**\n\nClaude Code builds a wider set of file-name patterns for recognizing backup and merge-conflict copies of a file. Besides plain `.orig` files, it now matches variants such as `.BACKUP_*`, `.BASE_*`, `.LOCAL_*`, and `.REMOTE_*`, including versions with dot or hash prefixes. These patterns work like wildcards (a `*` stands in for any text), letting one rule match many similarly-named files.\n\nThis appears to feed into something that watches files or excludes files from search, though it's not stated exactly which feature uses the new patterns.\n\n**Why**\n\nTools like Git and various merge utilities create these backup-style files when resolving conflicts, and they aren't meant to be treated as real source files. Recognizing more of these naming patterns means Claude Code is less likely to get confused by or needlessly surface leftover conflict artifacts.\n\n- Area: File Handling\n- Tier: You'll notice\n- Useful: 2\/5\n- Signal: 1\/5"}