self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Chore: Change Renovate rebase logic

Browse Source
This commit is contained in:
Laurent Cozic 2023-12-16 12:00:57 +00:00
parent 167892e383
commit d6c7902390
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renovate.json5
View File

@ -15,6 +15,10 @@
"prConcurrentLimit": 5,
"prHourlyLimit": 0,
// Tell Renovate to rebase only when there's a conflict, otherwise pull
// requests never get auto-merged because there are always new changes.
"rebaseWhen": "conflicted",
// It seems we need to delete the branches after merge or else it causes this problem:
// https://github.com/renovatebot/renovate/discussions/21256#discussioncomment-5898418
"pruneBranchAfterAutomerge": true,