From fc00109140a32f8e95c3019583fc3e986b5ea761 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 17 Apr 2025 17:40:13 +0530 Subject: [PATCH] Update AI_to_merge_conflict.yml Signed-off-by: jeet041 --- .github/workflows/AI_to_merge_conflict.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/AI_to_merge_conflict.yml b/.github/workflows/AI_to_merge_conflict.yml index 321468247..4d066d812 100644 --- a/.github/workflows/AI_to_merge_conflict.yml +++ b/.github/workflows/AI_to_merge_conflict.yml @@ -27,14 +27,14 @@ jobs: git config user.name "github-actions" git config user.email "actions@github.com" - - name: Detect Merge Conflicts - id: detect_conflicts - run: | - git fetch origin ${{ github.base_ref }} - git merge --no-commit --no-ff origin/${{ github.base_ref }} || true - git diff --name-only --diff-filter=U > conflict_files.txt - CONFLICT_FILES=$(cat conflict_files.txt | xargs) - echo "conflict_files=$CONFLICT_FILES" >> "$GITHUB_OUTPUT" + # - name: Detect Merge Conflicts + # id: detect_conflicts + # run: | + # git fetch origin ${{ github.base_ref }} + # git merge --no-commit --no-ff origin/${{ github.base_ref }} || true + # git diff --name-only --diff-filter=U > conflict_files.txt + # CONFLICT_FILES=$(cat conflict_files.txt | xargs) + # echo "conflict_files=$CONFLICT_FILES" >> "$GITHUB_OUTPUT" # - name: Exit if no conflicts # if: steps.detect_conflicts.outputs.conflict_files == ''