Skip to content

fix: fetch before merging in Update from Default Branch #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pol-rivero merged 1 commit into from
Mar 27, 2026
Merged

fix: fetch before merging in Update from Default Branch #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/ui/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ export class App extends React.Component<IAppProps, IAppState> {
// Disable autoupdates so that the app doesn't revert to the desktop/desktop upstream whenever there is an update.
}

private updateBranchWithContributionTargetBranch() {
private async updateBranchWithContributionTargetBranch() {
const { selectedState } = this.state
if (
selectedState == null ||
Expand All @@ -659,6 +659,8 @@ export class App extends React.Component<IAppProps, IAppState> {
return
}

await this.props.dispatcher.fetch(repository, FetchType.UserInitiatedTask)

this.props.dispatcher.initializeMergeOperation(
repository,
false,
Expand Down
Loading