Skip to content

Commit 84d7bd2

Browse files
committed
feat: add mergeUnstable option to default pull configuration
1 parent bd4bd5c commit 84d7bd2

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ to yours using **hard reset** periodically. You can also manually
9292
- base: master
9393
upstream: wei:master # change `wei` to the owner of upstream repo
9494
mergeMethod: hardreset
95+
mergeUnstable: true
9596
```
9697
9798
#### Advanced usage
@@ -140,9 +141,11 @@ rules:
140141
- base: master
141142
upstream: owner:master
142143
mergeMethod: hardreset
144+
mergeUnstable: true
143145
- base: docs
144146
upstream: owner:docs
145147
mergeMethod: hardreset
148+
mergeUnstable: true
146149
```
147150

148151
## Contributing

deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.0-alpha.2",
2+
"version": "2.0.0-alpha.3",
33
"tasks": {
44
"dev": "deno run --env-file --allow-all src/index.ts",
55
"dev:skip-full-sync": "deno task dev --skip-full-sync",

src/utils/get-pull-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ function getDefaultPullConfig(
5858
base: `${defaultBranch}`,
5959
upstream: `${upstreamOwner}:${defaultBranch}`,
6060
mergeMethod: appConfig.defaultMergeMethod,
61+
mergeUnstable: true,
6162
},
6263
],
6364
};

0 commit comments

Comments
 (0)