Manual vs Automatic Upstream Configuration in Sourcetree’s Git Flow: Which Ensures Consistent Branch Tracking?

The Verdict on Branch Tracking Consistency

For large teams, keeping automatic upstream configuration disabled ensures higher consistency and better tracking integrity. While enabling the toggle reduces manual steps, it prioritizes convenience over explicit intent, which often leads to "polluted" remotes filled with WIP (Work-in-Progress) branches and accidental tracking of incorrect remotes in forked environments.

Analysis of Workflow Trade-offs

Sourcetree’s Git Flow implementation acts as a UI wrapper for standard Git commands. The decision between manual and automatic tracking fundamentally changes when a branch becomes "public":

• Automatic (Enabled): Sourcetree executes the equivalent of git push -u origin <branch> immediately upon branch creation. This ensures the branch is tracked from second one but pushes unverified code to the server instantly.
• Manual (Disabled): Branches remain local-only. The developer must explicitly push the branch, at which point Sourcetree prompts to set the upstream. This creates a natural "checkpoint" where the developer confirms the branch name and destination remote.

Implementation and Standardization

To standardize upstream configuration without sacrificing efficiency, teams should adopt the following scoped approach:

1. Standardize the Toggle: Document the requirement to keep "Automatically set up tracking for new branches" disabled in the team's onboarding guide.
2. Enforce Naming via Server-Side Hooks: Since Sourcetree does not validate naming conventions, use server-side branch policies (e.g., GitHub/Bitbucket protected branch rules) to reject any push that doesn't follow the feature/, release/, or hotfix/ prefix.
3. Verification: Developers can verify tracking status by checking the sidebar in Sourcetree; the absence of the ↑/↓ (ahead/behind) counters indicates a branch lacks an upstream.

Verification Commands

If a branch was created without an upstream and needs to be linked manually via the terminal, use:

git branch --set-upstream-to=origin/branch-name local-branch-name

Assumptions and Uncertainty

This guidance assumes the use of Sourcetree 4.x (Windows) or 4.x/5.x (macOS), where this feature is disabled by default. Because Sourcetree's UI labels for this setting can vary slightly between OS versions, users should verify the exact wording in Preferences > Git.

Diagnostic Detail Needed: Are your developers working directly in a central repository or utilizing a fork-and-pull model? If using forks, automatic upstream is highly discouraged as it may attempt to push to the upstream source rather than the user's fork.