Skip to content

Commit

Permalink
Switch from --rebase to --ff-only (heroku#2680)
Browse files Browse the repository at this point in the history
  • Loading branch information
eablack authored Mar 6, 2024
1 parent 2a4ab79 commit fd574ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/create-release-pr
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if !(gh auth status --hostname "github.com" > /dev/null 2>&1); then
exit 1
fi

git pull --rebase origin "${MAIN_BRANCH}"
git pull --ff-only origin "${MAIN_BRANCH}"

# Create a branch with the unix timestamp of the current second
BRANCH_NAME="release-$(date +%s)"
Expand Down

0 comments on commit fd574ca

Please sign in to comment.