{"id":3633,"date":"2026-07-17T17:41:11","date_gmt":"2026-07-17T21:41:11","guid":{"rendered":"https:\/\/krishengreenwell.com\/blog\/?p=3633"},"modified":"2026-07-17T17:42:28","modified_gmt":"2026-07-17T21:42:28","slug":"the-sync-button-isnt-lying-to-you-your-branch-is","status":"publish","type":"post","link":"https:\/\/krishengreenwell.com\/blog\/the-sync-button-isnt-lying-to-you-your-branch-is\/","title":{"rendered":"The “Sync” Button Isn’t Lying to You \u2014 Your Branch Is"},"content":{"rendered":"\n
\"\"<\/a><\/figure>\n\n\n\n

I nearly shipped six commits straight to a shared branch a teammate was actively building on \u2014 with nothing more dramatic than one click of VS Code’s “Sync” button, on a branch I was sure was my own.<\/p>\n\n\n\n

The cause: origin\/shared-branch<\/code> in git checkout -b my-fix origin\/shared-branch<\/code> is obviously the starting point for the new branch’s history \u2014 but by default, git also treats it as the branch’s upstream, meaning my-fix<\/code> becomes an alias for origin\/shared-branch<\/code> for push purposes, even as its own commits diverge locally. The local name is cosmetic; the tracking relationship is what actually decides where “Sync” sends your commits, and from that moment, every Sync pushed straight to the shared branch. The tell in hindsight: a brand-new branch should show “Publish Branch,”<\/strong> not “Sync.”<\/strong> Seeing Sync on something I’d just created was the red flag I missed.<\/p>\n\n\n\n

Cleaning up:<\/strong> resist force-push on a shared branch \u2014 someone may have already fetched it. Instead: push the commits to their own branch, git revert<\/code> them on the shared branch (adds undo-commits instead of rewriting history), then cherry-pick the same commits onto a fresh branch off the now-reverted tip and open a normal PR. A few extra minutes, zero rewritten history.<\/p>\n\n\n\n

The real fix<\/strong> \u2014 stop relying on catching it in the moment:<\/p>\n\n\n\n

git config branch.autoSetupMerge false<\/code><\/pre>\n\n\n\n
This disables git’s default auto-tracking whenever a branch is created from a remote ref \u2014 the exact mechanism behind the mistake. Every new branch now starts with no upstream at all, so “Publish Branch” always appears first, forcing a conscious choice before anything gets pushed anywhere.<\/p>\n\n\n\n
When a tool does exactly what it’s configured to do, the fix isn’t “be more careful” \u2014 it’s changing the configuration so the mistake can’t happen again.<\/p>\n","protected":false},"excerpt":{"rendered":"
I nearly shipped six commits straight to a shared branch a teammate was actively building on \u2014 with nothing more dramatic than one click of VS Code’s “Sync” button, on a branch I was sure was my own. The cause: origin\/shared-branch in git checkout -b my-fix origin\/shared-branch is obviously the starting point for the new branch’s history \u2014 but […]<\/p>\n","protected":false},"author":1,"featured_media":3635,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-3633","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/posts\/3633","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/comments?post=3633"}],"version-history":[{"count":2,"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/posts\/3633\/revisions"}],"predecessor-version":[{"id":3636,"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/posts\/3633\/revisions\/3636"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/media\/3635"}],"wp:attachment":[{"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/media?parent=3633"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/categories?post=3633"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/krishengreenwell.com\/blog\/wp-json\/wp\/v2\/tags?post=3633"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}