closes coderoad#130. Merge conflict from cherry-pick

ShMcK · ShMcK · commit 138918c33f34 · 2020-03-08T15:41:45.000-07:00
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')
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ const cherryPickCommit = async (commit: string, count = 0): Promise<void> => {`
`19`	`19`	`return`
`20`	`20`	`}`
`21`	`21`	`try {`
`22`		- const { stdout } = await node.exec(`git cherry-pick ${commit}`)
	`22`	`+ // cherry-pick pulls commits from another branch`
	`23`	`+ // -X theirs merges and accepts incoming changes over existing changes`
	`24`	+ const { stdout } = await node.exec(`git cherry-pick -X theirs ${commit}`)
`23`	`25`	`if (!stdout) {`
`24`	`26`	`throw new Error('No cherry-pick output')`
`25`	`27`	`}`