Skip to content

Commit aa7db65

Browse files
committed
Defer this check to the merge analysis
1 parent 24e8a7d commit aa7db65

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

ObjectiveGit/GTRepository+Merging.m

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,6 @@ - (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)branch withError:(NSError **)er
120120
return NO;
121121
}
122122

123-
if ([localCommit.SHA isEqualToString:remoteCommit.SHA]) {
124-
// Local and remote tracking branch are already in sync
125-
return YES;
126-
}
127-
128123
GTMergeAnalysis analysis = GTMergeAnalysisNone;
129124
BOOL success = [self analyzeMerge:&analysis fromBranch:branch error:error];
130125
if (!success) {

0 commit comments

Comments
 (0)