Skip to content

Commit f237e5d

Browse files
committed
Fix other tes
1 parent 7b97d30 commit f237e5d

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ jobs:
8787
git --version
8888
git config user.name "GitHub Actions Bot"
8989
git config user.email "<>"
90-
git branch feat/merge-test
91-
git switch feat/merge-test
92-
touch merge-test
93-
echo 'merge-test' > merge-test
94-
git add merge-test
95-
git commit -m "merge-test"
90+
git branch feat/merge-test-no-bump
91+
git switch feat/merge-test-no-bump
92+
touch merge-test-no-bump
93+
echo 'merge-test-no-bump' > merge-test-no-bump
94+
git add merge-test-no-bump
95+
git commit -m "merge-test-no-bump"
9696
git checkout main
97-
git merge feat/merge-test --no-ff --commit --no-edit
97+
git merge feat/merge-test-no-bump --no-ff --commit --no-edit
9898
9999
git log
100100
echo "-------------------"

0 commit comments

Comments
 (0)