commit 1a8593533559b056c27d3d9b68641ef034ffbc25
author Frank Borden <frankborden@google.com> Thu Jul 22 14:12:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 22 14:12:59 2021 +0000
tree b58f73e600aa4d955af21b3d72c8a035996f553a
parent d36fbc159c7f4c6c198a41d65f35dcc67ffdb462
parent 404b551e0d572e18d36aa906d6de8978cb2fbe77

Merge "Adjust documentation to mention the overall value"

resources/Documentation/how-to-use.md

diff --git a/resources/Documentation/how-to-use.md b/resources/Documentation/how-to-use.md
index 3e8a162..4d7a2d9 100644
--- a/resources/Documentation/how-to-use.md
+++ b/resources/Documentation/how-to-use.md
@@ -246,6 +246,14 @@
 
 ![code owner override label in change page](./code-owner-override-label-in-change.png "Owners-override label")
 
+## <a id="mergeCommit">Merge commits
+
+When viewing the `Auto Merge` results on a merge commit, a file list row is
+added showing the number of cleanly merged files. The code owner status for
+this row indicates the overall approval status of the cleanly merged files.
+
+![merge commit UI](./owner-status-merge-commit.png "Merge Commit UI")
+
 ## <a id="definingCodeOwners">Defining code owners
 
 Code owners are defined in [code owner config

resources/Documentation/owner-status-merge-commit.png

diff --git a/resources/Documentation/owner-status-merge-commit.png b/resources/Documentation/owner-status-merge-commit.png
new file mode 100644
index 0000000..f766421
--- /dev/null
+++ b/resources/Documentation/owner-status-merge-commit.png
Binary files differ

resources/Documentation/user-guide.md

diff --git a/resources/Documentation/user-guide.md b/resources/Documentation/user-guide.md
index d6cc334..37049fc 100644
--- a/resources/Documentation/user-guide.md
+++ b/resources/Documentation/user-guide.md
@@ -250,9 +250,9 @@
 destination branch (the first parent commit). This includes all files that have
 been touched in other branches and that are now being integrated into the
 destination branch (regardless of whether there was a conflict resolution or
-whether the auto-merge succeeded without conflicts). To see these files in the
-change screen, `Parent 1` needs to be selected as base for the comparison
-(instead of the `Auto Merge` that is selected as base by default).
+whether the auto-merge succeeded without conflicts). The overall approval value
+for the automatically merged files is shown on the `Auto Merge` base along with
+a button to switch to the `Parent 1` base which shows the files individually.
 
 By [configuration](config.html#codeOwnersMergeCommitStrategy) it is possible,
 that changes for merge commits only require code owner approvals for files that