Merge branch 'main' into feature/bots

2022-12-22 12:00:41 +08:00
parent 88e813d1ca 3affb02df5
commit d183b32aa8
58 changed files with 2368 additions and 1716 deletions
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1036,6 +1036,9 @@ ROUTER = console
 ;;
 ;; Add co-authored-by and co-committed-by trailers if committer does not match author
 ;ADD_CO_COMMITTER_TRAILERS = true
+;;
+;; In addition to testing patches using the three-way merge method, re-test conflicting patches with git apply
+;TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY = false

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;