forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 05:36:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(actions): resolve backport warning (#66)

Browse source
This commit is contained in:
Cal Bera 2025-08-14 12:40:39 -07:00 committed by GitHub
parent 43a6aa8762
commit 524a4140ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/backport.yml vendored
View file

@ -121,10 +121,11 @@ jobs:
# Add original PR author as assignee
add_author_as_assignee: true
# What to do when there are conflicts
# Options: "fail" or "draft_commit_conflicts"
# Using draft_commit_conflicts so conflicts don't block the process
conflicts_strategy: "draft_commit_conflicts"
# Enable experimental features (includes conflict handling)
experimental: |
{
"detect_merge_method": true
}
# Cherry-picking strategy
# Options: "auto", "recursive", "ort"