-
Notifications
You must be signed in to change notification settings - Fork 0
36 lines (33 loc) · 1.03 KB
/
auto-resolve-conflicts.yml
File metadata and controls
36 lines (33 loc) · 1.03 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
name: "Fast Forward Predictable Conflict Resolution"
on:
push:
branches: [ "main" ]
pull_request:
types:
- opened
- synchronize
- reopened
- ready_for_review
workflow_dispatch:
inputs:
base-ref:
description: Base branch inspected for open pull requests.
required: false
type: string
default: main
pull-request-number:
description: Optional pull request number to inspect. Leave empty to scan open pull requests targeting the base branch.
required: false
type: string
default: ''
permissions:
actions: write
contents: write
pull-requests: write
jobs:
auto-resolve-conflicts:
uses: php-fast-forward/dev-tools/.github/workflows/auto-resolve-conflicts.yml@main
with:
base-ref: ${{ inputs.base-ref || github.event.pull_request.base.ref || github.event.repository.default_branch || 'main' }}
pull-request-number: ${{ inputs.pull-request-number || github.event.pull_request.number || '' }}
secrets: inherit