Assignment 1: Clarify automatic creation of merge commits on no conflicts

2020-11-13 13:22:34 +01:00 · 2020-11-13 13:22:34 +01:00 · 99fe87a72a
commit 99fe87a72a
parent 19f87719b6
1 changed files with 2 additions and 0 deletions
--- a/assignment1/README.md
+++ b/assignment1/README.md
@ -132,6 +132,8 @@ $ lit commit 'Merge r21 into r20'
 To complete the merge after manually resolving a conflict, invoke the `commit` sub-command.
 To abort the merge, use `checkout`.

+If no conflict is encountered, a merge commit is automatically created.
+
 ### `lit log`

 Displays a graph of all commits, one line per commit.