From 1280fea042c27d364a183d827ee58887a51738e1 Mon Sep 17 00:00:00 2001 From: KatWine Date: Wed, 10 Jan 2024 15:14:19 -0500 Subject: [PATCH 1/5] add feature 1 --- feature1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature1.txt diff --git a/feature1.txt b/feature1.txt new file mode 100644 index 0000000..7f34e39 --- /dev/null +++ b/feature1.txt @@ -0,0 +1 @@ +Feature 1 \ No newline at end of file From 12fcb4cf61dd95376670c74e86d734caedb6e767 Mon Sep 17 00:00:00 2001 From: KatWine Date: Wed, 10 Jan 2024 15:37:50 -0500 Subject: [PATCH 2/5] add feture 2 --- feature1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature1.txt diff --git a/feature1.txt b/feature1.txt new file mode 100644 index 0000000..d04f4c8 --- /dev/null +++ b/feature1.txt @@ -0,0 +1 @@ +Feature 2 \ No newline at end of file From 0fb70a3c6473815abdd3cef789cbde443f0c4b68 Mon Sep 17 00:00:00 2001 From: KatWine Date: Wed, 10 Jan 2024 17:27:20 -0500 Subject: [PATCH 3/5] changed name --- destination | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 destination diff --git a/destination b/destination new file mode 100644 index 0000000..81996a9 --- /dev/null +++ b/destination @@ -0,0 +1,5 @@ +<<<<<<< HEAD +Feature 1 +======= +Feature 2 +>>>>>>> branchB From bfe9a5252a53289234eb4120c154227f27f53934 Mon Sep 17 00:00:00 2001 From: KatWine Date: Wed, 10 Jan 2024 17:30:33 -0500 Subject: [PATCH 4/5] fixed --- feature2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature2.txt diff --git a/feature2.txt b/feature2.txt new file mode 100644 index 0000000..89356ee --- /dev/null +++ b/feature2.txt @@ -0,0 +1 @@ +New feature \ No newline at end of file From 5504f792a91c7b9b1077450d5a9c412fcc0dcb10 Mon Sep 17 00:00:00 2001 From: KatWine Date: Wed, 10 Jan 2024 17:46:01 -0500 Subject: [PATCH 5/5] removed --- feature1.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 feature1.txt diff --git a/feature1.txt b/feature1.txt deleted file mode 100644 index 7f34e39..0000000 --- a/feature1.txt +++ /dev/null @@ -1 +0,0 @@ -Feature 1 \ No newline at end of file