Cleanup the repository now that we've done the commit

tiennou · tiennou · commit 17aaeddc3de0 · 2018-10-28T19:23:24.000+01:00
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,11 @@ - (BOOL)mergeBranchIntoCurrentBranch:(GTBranch )branch withError:(NSError *)er`
`238`	`238`	`return NO;`
`239`	`239`	`}`
`240`	`240`
	`241`	`+ success = [self cleanupStateWithError:error];`
	`242`	`+ if (!success) {`
	`243`	`+ return NO;`
	`244`	`+ }`
	`245`	`+`
`241`	`246`	`success = [self checkoutReference:localBranch.reference options:[GTCheckoutOptions checkoutOptionsWithStrategy:GTCheckoutStrategyForce] error:error];`
`242`	`247`	`return success;`
`243`	`248`	`}`