Skip to content

Commit a7f2b3f

Browse files
AliSoftwareclaude
andcommitted
Clarify the wording of the realignment comment
"realign it on the remote" read as though the operation happened *on* the remote, rather than describing what the local branch is realigned against. Say plainly what the reset does instead: force the local branch to the fetched commit. Wording suggested by @mokagio in review. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent aef5ff0 commit a7f2b3f

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

.buildkite/commands/checkout-release-branch.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ BRANCH_NAME="release/${RELEASE_VERSION}"
1111
git fetch origin "$BRANCH_NAME"
1212
git checkout "$BRANCH_NAME"
1313
# Buildkite can reuse a working copy where "$BRANCH_NAME" was left at an older commit by a previous job,
14-
# so realign it on the remote. `reset --hard` rather than `git pull`, to avoid merging if the two diverged.
14+
# so force the local branch to the fetched commit. `reset --hard` rather than
15+
# `git pull`, to avoid merging if the two diverged.
1516
git reset --hard "origin/$BRANCH_NAME"

0 commit comments

Comments
 (0)