tree 2609c1dedb609ec2e6afde52ae261ad6f5860289
parent 966626aa96ff34a9971d97faf93040b7c8424e38
author Edwin Kempin <ekempin@google.com> 1659444532 +0200
committer Edwin Kempin <ekempin@google.com> 1659609091 +0200

Improve documentation of submit.mergeContent setting in project.config

* explain what a path conflict is and include an example
* explain the extra work and user confusion that comes with disabling
  content merges
* explain what's gained by disabling content merges
* discourage disabling content merge
* note that this setting is not relevant when fast-forward-only is used
  as the submit action

Release-Notes: skip
Bug: Google b/240397771
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: If3e2b29efea166be13069e35ed22f343f478957d