Skip to content

Commit 1f274dc

Browse files
authored
Merge pull request #111 from guplem/fix/fetch-before-update-from-main
fix: fetch before merging in Update from Default Branch
2 parents a5b51cd + 927d47c commit 1f274dc

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)