diff --git a/.github/pull.yml b/.github/pull.yml index ffdb37084..7b487a814 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -3,7 +3,7 @@ version: "1" rules: # Array of rules - base: master # Required. Target branch upstream: miekg/dns:master # Required. Must be in the same fork network. - mergeMethod: none # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. + mergeMethod: merge # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. mergeUnstable: false # Optional, merge pull request even when the mergeable_state is not clean. Default: false label: ":arrow_heading_down: pull" # Optional conflictLabel: "merge-conflict" # Optional, on merge conflict assign a custom label, Default: merge-conflict \ No newline at end of file