You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Option to delay conflict checking of old pull requests until page view
[repository.pull-request] CHECK_ONLY_LAST_UPDATED_DAYS specifies the
number of days in which the PR must have been last updated for conflict
checking to happen immediately when the base branch is updated.
The default value of -1 behaves exactly as before with no delay. With 0
all conflict checking will be delayed until page view. We have found
that 1 day works well in practice.
This mostly eliminates the "Merge conflict checking is in progress. Try
again in few moments." message when conflict checking is slow for big
repositories and many pull requests.
PRs that are actively being worked on will be checked immediately, while
for others are likely to actually get checked in the next few seconds.
Even better would be to auto-update the page as GitHub does, but this
relatively simple change effectively solved the problem for us.
Copy file name to clipboardExpand all lines: custom/conf/app.example.ini
+5Lines changed: 5 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -1087,6 +1087,11 @@ LEVEL = Info
1087
1087
;;
1088
1088
;; Retarget child pull requests to the parent pull request branch target on merge of parent pull request. It only works on merged PRs where the head and base branch target the same repo.
1089
1089
;RETARGET_CHILDREN_ON_MERGE = true
1090
+
;;
1091
+
;; Delay conflict checking until page view or API access, for pull requests that have not been updated in the specified number of days.
1092
+
;; The default `-1` means never delay. With `1` day, pull requests under active development will be checked quickly without undue server
0 commit comments