From 138918c33f3451bef05671bced9168f73fc23549 Mon Sep 17 00:00:00 2001
From: shmck <shawn.j.mckay@gmail.com>
Date: Sun, 8 Mar 2020 15:41:45 -0700
Subject: [PATCH] closes #130. Merge conflict from cherry-pick

---
 src/services/git/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/git/index.ts b/src/services/git/index.ts
index aa7bede0..e97e6695 100644
--- 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')
     }