We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 8a9afcd commit 14abef5Copy full SHA for 14abef5
.github/workflows/update-release-branch.yml
@@ -91,11 +91,14 @@ jobs:
91
shell: bash
92
run: |
93
echo "merging main @ $main_sha into release @ $release_sha";
94
+
95
+ # Getting rid of the changes caused by "Configure Gradle"
96
+ git stash
97
98
git switch release;
99
input_message=${{ inputs.commit_message }}
100
message=${input_message:-"Merging main into release"}
101
echo "message=$message"
- git stash
102
git merge -m "$message" main;
103
if [ "${{ env.DRY_RUN }}" == "true" ]; then
104
echo "dry run, skipping push to remote";
0 commit comments