Skip to content

New tool: git node bp for backporting a PR #194

@joyeecheung

Description

@joyeecheung

Rough idea:

ncu-config set remote upstream
ncu-config set branch v8.x-staging
git node bp --to v8.x-staging <prid1> <prid2>
# Fetch upstream/master
# Bring local v8.x-staging up-to-date with upstream/v8.x-staging
# git checkout -b backport-<prid1>-<prid2>-to-v8.x-staging v8.x-staging
# Look for commits on upstream/master with PR-URL ending with the provided PR IDs
# Run git cherry-pick <sha> on each of these commit

# Resolve conflict for commit1 from prid1
git node bp --continue
# Runs git cherry-pick --continue and git cherry-pick commit2
git node bp --skip
# Runs git cherry-pick --abort and git cherry-pick commit3
# Resolve conflict for commit3 from prid2
git node bp --continue
# Picked all commits that need to be backported now

Metadata

Metadata

Assignees

No one assigned

    Labels

    new toolNew tool that could be added to node-core-utils

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions