Ryan Lane has submitted this change and it was merged.
Change subject: Use JGit's recursive merge
......................................................................
Use JGit's recursive merge
This is now the default in JGit, and matches the behavior of
native git clients.
Affects repos using content merges (merge always, merge if
necessary), which is about 95% of our repositories.
Change-Id: I445460a6e05f4bae5308a25b07bc9fdcbe44cdc2
---
M templates/gerrit/gerrit.config.erb
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/gerrit/gerrit.config.erb
b/templates/gerrit/gerrit.config.erb
index c5eb41a..b1ece2e 100644
--- a/templates/gerrit/gerrit.config.erb
+++ b/templates/gerrit/gerrit.config.erb
@@ -7,6 +7,7 @@
packedGitLimit = 500m
packedGitWindowSize = 16k
streamFileThreshold = 100m
+ useRecursiveMerge = true
[database]
type = MYSQL
hostname = <%= dbhost %>
--
To view, visit https://gerrit.wikimedia.org/r/62669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I445460a6e05f4bae5308a25b07bc9fdcbe44cdc2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
