diff --git a/README.md b/README.md index c73e85fd776eb129b8b019ad252673da744f1fba..9a84429b3c237e83ad534cc071000e7d62717e20 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,7 @@ This will also cause a conflict. ======= This will cause a conflict. >>>>>>> conflict-branch +Staged change +Remote branch change +Change from another machine +Remote branch change