During an "update" automatically do the merge if there are no conflicts

### Description

It would be very helpful if update process just automatically would complete the merge for you, assuming it can be done with no conflicts. Then the user could be shown a command to revert the action rather than given the "git merge " command.

There must be some git command that allows you to predict if a merge will fail or not. Ideally this would also present the user with a list of files that have conflicts so the user knows what level of effort is involved.

Start by locating the update process and its Git command handling; the issue does not name specific files or tests. Determine how a no-conflict merge and conflict prediction should be represented, then verify the update behavior and the proposed revert or conflict-file guidance.

Written by the indexing model from the issue text.