Cleanup the repository now that we've done the commit

libgit2 · Mar 24, 2019 · 6435f82 · 6435f82
1 parent 7d4a1b1
commit 6435f82
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ObjectiveGit/GTRepository+Merging.m b/ObjectiveGit/GTRepository+Merging.m
@@ -238,6 +238,11 @@ - (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)branch withError:(NSError **)er
 		return NO;
 	}
 
+	success = [self cleanupStateWithError:error];
+	if (!success) {
+		return NO;
+	}
+
 	success = [self checkoutReference:localBranch.reference options:[GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategyForce] error:error];
 	return success;
 }