Skip to content

Commit b2ad584

Browse files
authored
Add conflict detection workflow for PRs
This workflow scans pull requests for overlapping file changes using the jules-merge tool.
1 parent 329ddf3 commit b2ad584

1 file changed

Lines changed: 23 additions & 0 deletions

File tree

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by @google/jules-fleet init
2+
# This workflow scans PRs for overlapping file changes.
3+
name: Conflict Detection
4+
5+
on:
6+
pull_request:
7+
branches: [main]
8+
9+
permissions:
10+
contents: read
11+
pull-requests: read
12+
13+
jobs:
14+
scan-overlaps:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Scan for overlapping changes
22+
run: |
23+
npx -y --package=@google/jules-merge jules-merge scan --json '{"prs":[${{ github.event.pull_request.number }}],"repo":"${{ github.repository }}","base":"${{ github.event.pull_request.base.ref }}"}'

0 commit comments

Comments
 (0)