{"version":"2.1.281","anchor":"git-merge-base-overlap-detection-for-syncrebase-new-helper","canonical_anchor":"git-merge-base-overlap-detection-for-syncrebase-new-helper","heading":"Git merge-base overlap detection for sync\/rebase (new helpers)","tier":"internal","area":"Cloud Sync","url":"https:\/\/changelogs.core-directive.com\/v\/2.1.281\/e\/git-merge-base-overlap-detection-for-syncrebase-new-helper","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.281","markdown":"### Git merge-base overlap detection for sync\/rebase (new helpers)\n\nNew sync and rebase code lists up to 50 files that were changed on both sides\n\n**Unclear.** The finding does not say which command or feature shows this list.\n\n**What**\n\nNew code compares three versions of a git project (the older starting point, your version and the incoming version) to list files changed on both sides, which is where conflicts can happen. It:\n\n- Skips dotfiles (hidden files whose names start with a dot)\n\n- Skips editor temporary and swap files\n\n- Caps the list at 50 files\n\n- Tidies quote-like characters when showing file names\n\n**Why**\n\nWhen changes are brought together, this gives a short list of the files most likely to clash, without noise from hidden or temporary files.\n\n- Area: Cloud Sync\n- Tier: Under the hood\n- Useful: 1\/5\n- Signal: 2\/5"}