Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attempt-backport: enable 3-way merge for git am #117

Merged
merged 1 commit into from
Jan 28, 2017
Merged

attempt-backport: enable 3-way merge for git am #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/attempt-backport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`])
Expand Down