From d087bb2865389e2b5044641475d3c90a5037e469 Mon Sep 17 00:00:00 2001 From: Edric Tang <emt94@drexel.edu> Date: Tue, 3 Dec 2024 23:36:23 -0500 Subject: [PATCH] Update README on remote-branch --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2813b2c..50b4a69 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ This will also cause a conflict. ======= This will cause a conflict. >>>>>>> conflict-branch +Staged change +Remote branch change -- GitLab