Simple App to help @jaspermayone make it through COMP1050 with a professor who won't use version control.
Unstage changes after merge for selective staging
After git merge, run git reset to unstage all changes.
This allows users to use git add -p for selective hunk staging.
+3
+3
ZipMerge/FileComparer.swift
+3
ZipMerge/FileComparer.swift
···
61
61
let mergeOutput = try? runGitCommand(["merge", "--no-commit", "--no-ff", branchName], at: projectDirectory)
62
62
let hasConflicts = mergeOutput?.contains("CONFLICT") ?? false
63
63
64
+
// Unstage all changes so user can selectively stage with git add -p
65
+
try? runGitCommand(["reset"], at: projectDirectory)
66
+
64
67
return GitMergeResult(
65
68
branchName: branchName,
66
69
originalBranch: originalBranch,