epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-23 00:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' of github.com:digikwal/frappe_docker

Browse source 
# Conflicts:
#	.github/workflows/auto-merge-fieldmate.yml
This commit is contained in:
digikwal 2025-06-26 23:31:19 +02:00
commit 1d4637f720
No known key found for this signature in database
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/auto-merge-fieldmate.yml vendored
View file

@ -24,7 +24,6 @@ jobs:
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
echo "Trying to enable auto-merge for PR #$PR_NUMBER"
# Try auto-merge first
gh pr merge "$PR_NUMBER" \
--squash \
@ -32,7 +31,6 @@ jobs:
--delete-branch \
--body "$COMMIT_BODY" \
--subject "$COMMIT_TITLE" || \
# Fallback: direct squash merge
gh pr merge "$PR_NUMBER" \
--squash \