Skip to content

Add 2-lines instructions to backport.ts #117

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add 2-lines instructions to backport.ts #117

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f3ca8b
Add 2-lines instructions to backport.ts
averkhaturau Oct 7, 2025
04130db
add `git cherry-pick --continue` for more convenience
averkhaturau Oct 7, 2025
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
6 changes: 6 additions & 0 deletions src/backport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ const getFailedBackportCommentBody = ({
`git worktree remove ${worktreePath}`,
"```",
`Then, create a pull request where the \`base\` branch is \`${base}\` and the \`compare\`/\`head\` branch is \`${head}\`.`,
"The same operations in one line (use carefully)",
"```bash",
`git fetch && git worktree add ${worktreePath} ${base} && pushd ${worktreePath} && git switch --create ${head} && git cherry-pick -x --mainline 1 ${commitSha} && git mergetool`,
"# ... and after fixing all conflicts",
`git cherry-pick --continue && git push --set-upstream origin ${head} && popd && git worktree remove ${worktreePath}`,
"```"
].join("\n");
};

Expand Down