We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent c7b439a commit 1a2fd36Copy full SHA for 1a2fd36
ObjectiveGit/GTRepository+Pull.m
@@ -80,8 +80,12 @@ - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:
80
message:[NSString stringWithFormat:@"Merge branch '%@'", localBranch.shortName]
81
error:error];
82
83
- return *error == nil;
+ [self checkoutReference:localBranch.reference
84
+ strategy:GTCheckoutStrategyForce
85
+ error:error
86
+ progressBlock:nil];
87
88
+ return *error == nil;
89
} else if (analysis & GTMergeAnalysisNormal) {
90
// Do normal merge
91
GTTree *remoteTree = remoteCommit.tree;
0 commit comments