π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
fix: auto merge workflow fixes
sriram veeraghanta32d14d7000a3
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.ymlindex f31c11a69d..908f1ea935 100644--- a/.github/workflows/auto-merge.yml+++ b/.github/workflows/auto-merge.yml@@ -1,4 +1,4 @@-name: Auto Merge or Create PR on Push+name: Create PR on Syncon:workflow_dispatch:@@ -56,29 +56,7 @@ jobs:sudo apt updatesudo apt install gh -y- - name: Check for merge conflicts- id: conflicts- run: |- git fetch origin $TARGET_BRANCH- git checkout $TARGET_BRANCH- # Attempt to merge the main branch into the current branch- if $(git merge --no-commit --no-ff $SOURCE_BRANCH); then- echo "No merge conflicts detected."- echo "HAS_CONFLICTS=false" >> $GITHUB_ENV- else- echo "Merge conflicts detected."- echo "HAS_CONFLICTS=true" >> $GITHUB_ENV- git merge --abort- fi-- - name: Merge Change to Target Branch- if: env.HAS_CONFLICTS == 'false'- run: |- git commit -m "Merge branch '$SOURCE_BRANCH' into $TARGET_BRANCH"- git push origin HEAD:$TARGET_BRANCH-- name: Create PR to Target Branch- if: env.HAS_CONFLICTS == 'true'run: |# get all pull requests and check if there is already a PRPR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $SOURCE_BRANCH --json number | jq '.[] | .number')