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 24e8a7d commit aa7db65Copy full SHA for aa7db65
ObjectiveGit/GTRepository+Merging.m
@@ -120,11 +120,6 @@ - (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)branch withError:(NSError **)er
120
return NO;
121
}
122
123
- if ([localCommit.SHA isEqualToString:remoteCommit.SHA]) {
124
- // Local and remote tracking branch are already in sync
125
- return YES;
126
- }
127
-
128
GTMergeAnalysis analysis = GTMergeAnalysisNone;
129
BOOL success = [self analyzeMerge:&analysis fromBranch:branch error:error];
130
if (!success) {
0 commit comments