Skip to content

Commit 927d47c

Browse files
guplemclaude
andcommitted
fix: fetch before merging in Update from Default Branch
Without a fetch, the operation compared against the stale local ref for the default branch, causing it to incorrectly report "already up to date" when remote had unpulled commits. Fixes #110 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent a5b51cd commit 927d47c

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

app/src/ui/app.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ export class App extends React.Component<IAppProps, IAppState> {
640640
// Disable autoupdates so that the app doesn't revert to the desktop/desktop upstream whenever there is an update.
641641
}
642642

643-
private updateBranchWithContributionTargetBranch() {
643+
private async updateBranchWithContributionTargetBranch() {
644644
const { selectedState } = this.state
645645
if (
646646
selectedState == null ||
@@ -659,6 +659,8 @@ export class App extends React.Component<IAppProps, IAppState> {
659659
return
660660
}
661661

662+
await this.props.dispatcher.fetch(repository, FetchType.UserInitiatedTask)
663+
662664
this.props.dispatcher.initializeMergeOperation(
663665
repository,
664666
false,

0 commit comments

Comments
 (0)