mirror of
https://github.com/keanuplayz/dotfiles.git
synced 2024-08-15 02:33:12 +00:00
Updated merge strategy.
This commit is contained in:
parent
159a142967
commit
4d6ff353f9
1 changed files with 2 additions and 2 deletions
4
.github/pull.yml
vendored
4
.github/pull.yml
vendored
|
@ -1,6 +1,6 @@
|
|||
version: "1"
|
||||
version: '1'
|
||||
rules:
|
||||
- base: master
|
||||
upstream: dmitmel:master
|
||||
mergeMethod: merge
|
||||
mergeMethod: rebase
|
||||
mergeUnstable: true
|
||||
|
|
Loading…
Reference in a new issue