opendev/gerrit
Code Issues Proposed changes

Add missing 'Allow content merges' section title in project config documentation

Browse Source 
Change-Id: I49dc89fabedf17996c5f8245b3fb024df2b2e6e3
This commit is contained in:
David Pursehouse 2019-06-04 14:21:26 +09:00
parent 2e977627ac
commit 41385b1a00
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/project-configuration.txt
View File

@ -131,6 +131,8 @@ Thus, Rebase Always can be considered similar to Cherry Pick, but with
the important distinction that Rebase Always does not ignore dependencies.
[[content_merge]]
=== Allow content merges
If `Allow content merges` is enabled, Gerrit will try
to do a content merge when a path conflict occurs.