Repository navigation
fix: compare branches against nearest default baseline - #82
Merged
Merged
Conversation
Auto mode merge-based against local default only, so branches cut from a fresher origin/main included upstream commits. Pick the nearer of local and remote-tracking default merge bases; ties and divergence keep local.
flexdinesh
enabled auto-merge (squash)
October 21, 2026 07:06
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
diffsource.DefaultBaselinesreplacesDefaultBranch: returns local default ref plus remote-tracking counterpart (local default's upstream underrefs/remotes/, elseorigin/<default>). Never reads the feature branch's upstream; never fetches.nearestBaselinein autoOpenComparison: uses remote merge base only when it strictly descends from local; ties/divergence keep local; unrelated histories skipped. Fixes branches cut from a fresherorigin/mainshowing upstream commits as branch changes, without leaking unpushed local-main commits or regressing on stale remotes.baseRefmay berefs/remotes/...;verifyComparisonre-checks it (409 on move). UI already stripsrefs/remotes/.docs/plugins.md,README.mddescribe the nearest-baseline rule.comparison_test.gocases;mise run checkpasses; process-mode repro (local main=A, origin/main=A→B, feature from origin/main) recordsrefs/remotes/origin/mainat B.