Merge pull request coderoad#137 from ShMcK/fix/merge-conflict

ShMcK · web-flow · commit c4d5bf460b02 · 2020-03-08T15:42:27.000-07:00
closes coderoad#130. Merge conflict from cherry-pick
diff --git a/src/services/git/index.ts b/src/services/git/index.ts
@@ -19,7 +19,9 @@ const cherryPickCommit = async (commit: string, count = 0): Promise<void> => {
     return
   }
   try {
-    const { stdout } = await node.exec(`git cherry-pick ${commit}`)
+    // cherry-pick pulls commits from another branch
+    // -X theirs merges and accepts incoming changes over existing changes
+    const { stdout } = await node.exec(`git cherry-pick -X theirs ${commit}`)
     if (!stdout) {
       throw new Error('No cherry-pick output')
     }
