From a5431e578ec704f2875c880ebee5e30f94254edf Mon Sep 17 00:00:00 2001 From: Doris Akoto Date: Mon, 27 Jan 2025 10:17:31 +0100 Subject: [PATCH 1/5] added text file --- doristextfile.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 doristextfile.txt diff --git a/doristextfile.txt b/doristextfile.txt new file mode 100644 index 0000000..e69de29 From 0bd200cee41a385db84685cae5b9d57be66eea08 Mon Sep 17 00:00:00 2001 From: Doris Akoto Date: Mon, 27 Jan 2025 16:30:43 +0100 Subject: [PATCH 2/5] ediited file --- doristextfile.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doristextfile.txt b/doristextfile.txt index e69de29..ec4d10b 100644 --- a/doristextfile.txt +++ b/doristextfile.txt @@ -0,0 +1,6 @@ +hello world +I am a cat +I like git +yo +bro +here comes the edittttttttt From 404920dd6fb0da3520067322d9c9d40ff15406c0 Mon Sep 17 00:00:00 2001 From: dorisakoto Date: Mon, 27 Jan 2025 16:44:17 +0100 Subject: [PATCH 3/5] Delete doristextfile.txt --- doristextfile.txt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 doristextfile.txt diff --git a/doristextfile.txt b/doristextfile.txt deleted file mode 100644 index ec4d10b..0000000 --- a/doristextfile.txt +++ /dev/null @@ -1,6 +0,0 @@ -hello world -I am a cat -I like git -yo -bro -here comes the edittttttttt From 1c74a208a53a966a6f8a34c9c5c315ca2c4a603c Mon Sep 17 00:00:00 2001 From: Doris Akoto Date: Mon, 27 Jan 2025 17:24:13 +0100 Subject: [PATCH 4/5] second editted file --- doristextfile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doristextfile.txt b/doristextfile.txt index ec4d10b..47d3405 100644 --- a/doristextfile.txt +++ b/doristextfile.txt @@ -4,3 +4,4 @@ I like git yo bro here comes the edittttttttt +second editttt From e5bf40f0510b01cc3f2fa6e7a5adfb46db305cb0 Mon Sep 17 00:00:00 2001 From: Doris Akoto Date: Mon, 27 Jan 2025 17:48:48 +0100 Subject: [PATCH 5/5] conflict edit --- doristextfile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doristextfile.txt b/doristextfile.txt index 47d3405..03b4460 100644 --- a/doristextfile.txt +++ b/doristextfile.txt @@ -5,3 +5,4 @@ yo bro here comes the edittttttttt second editttt +third edittttt