Skip to content

Commit f48e1d4

Browse files
authored
Update dotnet-desktop.yml
1 parent b18f04a commit f48e1d4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/dotnet-desktop.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,13 @@ jobs:
6060
done
6161
6262
- name: GIT commit and push overriding conflicts with local changes (verbose)
63+
continue-on-error: true
6364
run: |
6465
git commit -m "Update version to ${{ env.RELEASE_VERSION }}"
6566
git fetch origin
6667
git rebase --strategy-option=theirs origin/main
6768
git push
68-
69+
6970
- name: Build and package
7071
run: |
7172
IFS=$'\n' # Set the Internal Field Separator to newline for reading multi-line variable

0 commit comments

Comments
 (0)