From 171abe349e1ef1f3d187fb506febf89ae580920a Mon Sep 17 00:00:00 2001 From: Marsha Shearin Date: Tue, 4 Oct 2022 13:45:38 -0400 Subject: [PATCH 1/4] Added text file --- README.md | 2 ++ index.txt | 0 2 files changed, 2 insertions(+) create mode 100644 index.txt diff --git a/README.md b/README.md index 0f484d5..a95a073 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # git-example An example repo to demonstrate using git + +Marsha has made her changes to this REAMME doc \ No newline at end of file diff --git a/index.txt b/index.txt new file mode 100644 index 0000000..e69de29 From d7f5e5d4a3d31e29d753aae8cfaa152a6c9ed73c Mon Sep 17 00:00:00 2001 From: Marsha Shearin <109562329+marshakprograms@users.noreply.github.com> Date: Tue, 4 Oct 2022 13:58:14 -0400 Subject: [PATCH 2/4] Update index.txt --- index.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/index.txt b/index.txt index e69de29..4aa610c 100644 --- a/index.txt +++ b/index.txt @@ -0,0 +1 @@ +Making some changes in the file on GitHub From ba63930e04edb2f14039509987f32a33b5ccef95 Mon Sep 17 00:00:00 2001 From: Marsha Shearin Date: Tue, 4 Oct 2022 13:58:37 -0400 Subject: [PATCH 3/4] updated text --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a95a073..dd8de25 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-example An example repo to demonstrate using git -Marsha has made her changes to this REAMME doc \ No newline at end of file +Marsha has made her changes to this REAMME doc +Now I am making even more changes \ No newline at end of file From 50a25167b1febb532a0cbcab5e7a8db72bdba64d Mon Sep 17 00:00:00 2001 From: Marsha Shearin Date: Tue, 4 Oct 2022 14:09:03 -0400 Subject: [PATCH 4/4] merge issue --- README.md | 1 - index.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd8de25..98e4540 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,3 @@ An example repo to demonstrate using git Marsha has made her changes to this REAMME doc -Now I am making even more changes \ No newline at end of file diff --git a/index.txt b/index.txt index e69de29..db285c3 100644 --- a/index.txt +++ b/index.txt @@ -0,0 +1 @@ +Now I am making even more changes \ No newline at end of file