Skip to content

Commit 3a48a8a

Browse files
authored
Apply suggestion from @Phlogistique
1 parent b148a85 commit 3a48a8a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

update-pr-stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ See $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
239239
echo "git fetch origin"
240240
echo "git switch $BRANCH"
241241
echo "git merge --ff-only origin/$BRANCH"
242-
echo "uvx 'git-merge-onto>=0.2' --absorbed origin/$BASE_BRANCH origin/$MERGED_BRANCH"
242+
echo "uvx git-merge-onto origin/$BASE_BRANCH origin/$MERGED_BRANCH --absorbed"
243243
echo '```'
244244
echo
245245
echo 'Fix the conflicts (for instance with `git mergetool`), then run `git add -A && git commit` to finish the merge.'

0 commit comments

Comments
 (0)