Skip to content

Commit

Permalink
Missed a reference to the default branch (#708)
Browse files Browse the repository at this point in the history
  • Loading branch information
F-WRunTime authored Jul 18, 2024
1 parent 3244fe8 commit 9c03323
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/master-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
new_master="$(git rev-parse origin/master)"
if git diff --exit-code ${old_master} ${new_master} -- package/version; then
og_version=$(git show origin/${GITHUB_BASE_REF}:package/version)
og_version=$(git show origin/master:package/version)
./package/version.sh bump ${og_version}
else
git merge --no-edit --strategy-option=theirs origin/master
Expand Down

0 comments on commit 9c03323

Please sign in to comment.