DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-18 05:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update AI_to_merge_conflict.yml

Browse source 
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
This commit is contained in:
jeet041 2025-04-17 17:40:13 +05:30 committed by GitHub
parent 07d1634c69
commit fc00109140
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.github/workflows/AI_to_merge_conflict.yml vendored
View file

@ -27,14 +27,14 @@ jobs:
git config user.name "github-actions" git config user.name "github-actions"
git config user.email "actions@github.com" git config user.email "actions@github.com"
- name: Detect Merge Conflicts # - name: Detect Merge Conflicts
id: detect_conflicts # id: detect_conflicts
run: | # run: |
git fetch origin ${{ github.base_ref }} # git fetch origin ${{ github.base_ref }}
git merge --no-commit --no-ff origin/${{ github.base_ref }} || true # git merge --no-commit --no-ff origin/${{ github.base_ref }} || true
git diff --name-only --diff-filter=U > conflict_files.txt # git diff --name-only --diff-filter=U > conflict_files.txt
CONFLICT_FILES=$(cat conflict_files.txt | xargs) # CONFLICT_FILES=$(cat conflict_files.txt | xargs)
echo "conflict_files=$CONFLICT_FILES" >> "$GITHUB_OUTPUT" # echo "conflict_files=$CONFLICT_FILES" >> "$GITHUB_OUTPUT"
# - name: Exit if no conflicts # - name: Exit if no conflicts
# if: steps.detect_conflicts.outputs.conflict_files == '' # if: steps.detect_conflicts.outputs.conflict_files == ''