Skip to content

Commit bfb937a

Browse files
committed
chore: stash changes before merging back [skip ci]
1 parent 63f8955 commit bfb937a

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

.github/workflows/release-candidate.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
GH_TOKEN: ${{ secrets.VERSION_BUMP_TOKEN }}
4141
- name: Merge back changes
4242
run: |
43+
git stash
4344
git checkout develop
4445
git pull origin develop
4546
git merge master

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
allow_override: true
5454
- name: Merge back changes
5555
run: |
56+
git stash
5657
git checkout develop
5758
git pull origin develop
5859
git merge master

0 commit comments

Comments
 (0)