Write merge conflicted files the right way™️

Author: pietbrauer

ObjectiveGit/GTRepository+Pull.m

@@ -112,15 +112,23 @@ - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:
 			NSMutableArray <NSString *>*files = [NSMutableArray array];
 			[index enumerateConflictedFilesWithError:error usingBlock:^(GTIndexEntry * _Nonnull ancestor, GTIndexEntry * _Nonnull ours, GTIndexEntry * _Nonnull theirs, BOOL * _Nonnull stop) {
 				[files addObject:ours.path];
-
-				GTMergeFileResult *result = [index mergeIndexEntries:ancestor ours:ours theirs:theirs error:error];
-				NSURL *oursFileURL = [self.fileURL URLByAppendingPathComponent:result.path];
-				[result.contents writeToURL:oursFileURL atomically:YES encoding:NSUTF8StringEncoding error:error];
 			}];
+
 			if (error != NULL) {
 				NSDictionary *userInfo = @{GTPullMergeConflictedFiles: files};
 				*error = [NSError git_errorFor:GIT_ECONFLICT description:@"Merge conflict, Pull aborted." userInfo:userInfo failureReason:nil];
 			}
+
+			// Write conflicts
+			git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
+			git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
+			checkout_opts.checkout_strategy = GIT_CHECKOUT_ALLOW_CONFLICTS;
+
+			git_annotated_commit *annotatedCommit;
+			[self annotatedCommit:&annotatedCommit fromCommit:remoteCommit error:error];
+
+			git_merge(repo.git_repository, (const git_annotated_commit **)&annotatedCommit, 1, &merge_opts, &checkout_opts);
+
 			return NO;
 		}
 
@@ -146,6 +154,16 @@ - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:
 	return NO;
 }
 
+- (BOOL)annotatedCommit:(git_annotated_commit **)annotatedCommit fromCommit:(GTCommit *)fromCommit error:(NSError **)error {
+	int gitError = git_annotated_commit_lookup(annotatedCommit, self.git_repository, fromCommit.OID.git_oid);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to lookup annotated commit for %@", fromCommit];
+		return NO;
+	}
+
+	return YES;
+}
+
 - (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error {
 	NSParameterAssert(analysis != NULL);
 	NSParameterAssert(fromBranch != nil);
@@ -156,18 +174,13 @@ - (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBran
 	}
 
 	git_annotated_commit *annotatedCommit;
-
-	int gitError = git_annotated_commit_lookup(&annotatedCommit, self.git_repository, fromCommit.OID.git_oid);
-	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to lookup annotated comit for %@", fromCommit];
-		return NO;
-	}
+	[self annotatedCommit:&annotatedCommit fromCommit:fromCommit error:error];
 
 	// Allow fast-forward or normal merge
 	git_merge_preference_t preference = GIT_MERGE_PREFERENCE_NONE;
 
 	// Merge analysis
-	gitError = git_merge_analysis((git_merge_analysis_t *)analysis, &preference, self.git_repository, (const git_annotated_commit **) &annotatedCommit, 1);
+	int gitError = git_merge_analysis((git_merge_analysis_t *)analysis, &preference, self.git_repository, (const git_annotated_commit **) &annotatedCommit, 1);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to analyze merge"];
 		return NO;