{"version":"2.1.283","anchor":"sync-index-merge-reports-failures-more-precisely","canonical_anchor":"sync-index-merge-reports-failures-more-precisely","heading":"Sync reports index merge failures separately from staged changes","tier":"notice","area":"Cloud Sync","url":"https:\/\/changelogs.core-directive.com\/v\/2.1.283\/e\/sync-index-merge-reports-failures-more-precisely","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.283","markdown":"### Sync reports index merge failures separately from staged changes\n\nSync now blames staged changes only when a staged file really overlaps incoming commits, and reports other merge failures as index_merge_failed\n\n**What**\n\nWhen sync pulls in new commits, git has to merge them into its index, the list of changes staged for the next commit. When that merge fails, sync now reports the reason more precisely:\n\n- `staged_changes` is reported only if a file you have staged really overlaps the incoming commits. This is checked with git's `diff-tree` and `diff-index` commands.\n\n- `index_merge_failed` is a new reason, shown as \"the index merge failed\", for any other failure.\n\nThe new reason joins the existing git-state reasons `staged_changes`, `operation_in_progress` and `checked_out_elsewhere`.\n\n**Why**\n\nBefore, every such failure was reported as `staged_changes`, even when you had nothing staged that got in the way. The message now points at your staged files only when they are actually the cause.\n\n- Area: Cloud Sync\n- Tier: You'll notice\n- Useful: 1\/5\n- Signal: 1\/5"}