Commitc4d5bf4

authored

Merge pull requestcoderoad#137 from ShMcK/fix/merge-conflict

closescoderoad#130. Merge conflict from cherry-pick

2 parents3d0587a +138918c commitc4d5bf4Copy full SHA for c4d5bf4

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

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}=awaitnode.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}=awaitnode.exec(`git cherry-pick -X theirs${commit}`)
`23`	`25`	`if(!stdout){`
`24`	`26`	`thrownewError('No cherry-pick output')`
`25`	`27`	`}`

Comments

(0)