From 8c70bbaaef4d89ac25ef0fc6f4aaed728560238c Mon Sep 17 00:00:00 2001 From: Phillip Johnsen Date: Wed, 25 Jan 2017 20:57:09 +0100 Subject: [PATCH] attempt-backport: enable 3-way merge for git am We've seen a lot of patches not applied cleanly by the bot, which in fact should have landed without trouble, at least with 3-way merges enabled. This trivial change enables fallback to 3-way merge when a patch doesn't apply cleanly when running `git am`. --- scripts/attempt-backport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/attempt-backport.js b/scripts/attempt-backport.js index d08b7a73..ff7ac2b1 100644 --- a/scripts/attempt-backport.js +++ b/scripts/attempt-backport.js @@ -214,7 +214,7 @@ function attemptBackport (options, version, isLTS, cb) { function gitAttemptBackport (req) { options.logger.debug(`attempting a backport to v${version}...`) - const cp = wrapCP('git', ['am'], { stdio: 'pipe' }, function done () { + const cp = wrapCP('git', ['am', '-3'], { stdio: 'pipe' }, function done () { // Success! if (isLTS) { fetchExistingThenUpdatePr(options, [`lts-watch-v${version}.x`])