opensource/nocobase
3
0
Fork 0
mirror of https://github.com/nocobase/nocobase.git synced 2026-09-24 16:02:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source 
# Conflicts:
#	.github/workflows/manual-release.yml
This commit is contained in:
chenos
2024-07-16 15:52:33 +08:00
parent 82f3e52c34 31c54896fb
commit f22632234c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/manual-release.yml
+2 -2
View File
@@ -141,7 +141,7 @@ jobs:
git checkout main
git pull origin main
git checkout next
git merge -X ours main
git merge -X ours main --no-edit
git push origin next
- name: main -> next
run: |
@@ -149,7 +149,7 @@ jobs:
git checkout main
git pull origin main
git checkout next
git merge -X ours main
git merge -X ours main --no-edit
git push origin next
- name: push pro plugins
continue-on-error: true