From 67600c141a18d869fd07d0e9b311db9744759820 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:16:07 +0500 Subject: [PATCH 01/11] adding things to branch1 --- test-branch1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test-branch1.txt diff --git a/test-branch1.txt b/test-branch1.txt new file mode 100644 index 0000000..9b7ab2d --- /dev/null +++ b/test-branch1.txt @@ -0,0 +1 @@ +this is the branch 1. \ No newline at end of file From fcda003e2061c58e36d43aeda27119b481efb821 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:18:49 +0500 Subject: [PATCH 02/11] commiting for merge --- hello.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hello.txt diff --git a/hello.txt b/hello.txt new file mode 100644 index 0000000..a26cfcf --- /dev/null +++ b/hello.txt @@ -0,0 +1,3 @@ +I have added this new file +commit for mixed +new commit for 3merging. \ No newline at end of file From 63e308d8a51f5b0b042b48325f4ceeb31a829934 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:22:21 +0500 Subject: [PATCH 03/11] commiting for merge --- test-branch1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-branch1.txt b/test-branch1.txt index 9b7ab2d..2366b14 100644 --- a/test-branch1.txt +++ b/test-branch1.txt @@ -1 +1 @@ -this is the branch 1. \ No newline at end of file +this is the branch1 \ No newline at end of file From 8af85eba3303f56b89af39e89d91531193fcedc3 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:22:42 +0500 Subject: [PATCH 04/11] commiting --- hello.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hello.txt b/hello.txt index a26cfcf..da579e4 100644 --- a/hello.txt +++ b/hello.txt @@ -1,3 +1,3 @@ I have added this new file commit for mixed -new commit for 3merging. \ No newline at end of file +new commit for 3merging \ No newline at end of file From 986652f4ecfac496ae0df19e3a5bd539de5931c3 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:27:15 +0500 Subject: [PATCH 05/11] commiting for branch2 --- test-branch2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test-branch2.txt diff --git a/test-branch2.txt b/test-branch2.txt new file mode 100644 index 0000000..6763fbf --- /dev/null +++ b/test-branch2.txt @@ -0,0 +1 @@ +this is the branch2 file \ No newline at end of file From e11a66b1854945576da4f1b8d344f92447267e67 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:30:44 +0500 Subject: [PATCH 06/11] commiting for branch2 --- test-branch2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-branch2.txt b/test-branch2.txt index 6763fbf..f529af9 100644 --- a/test-branch2.txt +++ b/test-branch2.txt @@ -1 +1 @@ -this is the branch2 file \ No newline at end of file +this is the branch2 \ No newline at end of file From 8fdcb89cac1873ff58db4cbd882e81c0cdc5dd6c Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:35:01 +0500 Subject: [PATCH 07/11] commiting --- test-branch1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test-branch1.txt b/test-branch1.txt index 2366b14..3930faf 100644 --- a/test-branch1.txt +++ b/test-branch1.txt @@ -1 +1,2 @@ -this is the branch1 \ No newline at end of file +this is the branch1 +Hello from resolvingbranch \ No newline at end of file From bce2a527e00abcccbeb52f8eac06221acfd68f81 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:37:13 +0500 Subject: [PATCH 08/11] commiting --- test-branch1.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test-branch1.txt diff --git a/test-branch1.txt b/test-branch1.txt new file mode 100644 index 0000000..0462ed7 --- /dev/null +++ b/test-branch1.txt @@ -0,0 +1,3 @@ +this is the branch1 +Hello from resolvingbranch +Hello from main \ No newline at end of file From e337775f3162582a4ee1a1f0a45b1b607cbdfaa5 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:41:39 +0500 Subject: [PATCH 09/11] rebasing branch --- rebasingbranch.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 rebasingbranch.txt diff --git a/rebasingbranch.txt b/rebasingbranch.txt new file mode 100644 index 0000000..f12fa40 --- /dev/null +++ b/rebasingbranch.txt @@ -0,0 +1 @@ +rebasing file \ No newline at end of file From e7d0835c8894cf945f0bdf4ce26d0a460dae6756 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 20:42:48 +0500 Subject: [PATCH 10/11] rebasing branch --- test-branch1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test-branch1.txt b/test-branch1.txt index 7a90f40..f1f9b98 100644 --- a/test-branch1.txt +++ b/test-branch1.txt @@ -5,3 +5,4 @@ Hello from main ======= Hello from resolvingbranch >>>>>>> resolvingbranch +rebasing file \ No newline at end of file From 7e779a4d84e07b44fa38f74eba373e5834f05bc3 Mon Sep 17 00:00:00 2001 From: Safa Date: Tue, 19 Sep 2023 21:05:21 +0500 Subject: [PATCH 11/11] add new file --- pr-example.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 pr-example.txt diff --git a/pr-example.txt b/pr-example.txt new file mode 100644 index 0000000..4714763 --- /dev/null +++ b/pr-example.txt @@ -0,0 +1 @@ +this is pull request \ No newline at end of file