From ef04f6bc325ba17f9425265b137e7fa2718c52af Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Tue, 29 Dec 2020 21:03:45 +0530 Subject: [PATCH 01/18] Add README2.md and enjoygit status! --- README2.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README2.md diff --git a/README2.md b/README2.md new file mode 100644 index 000000000..e69de29bb From d09b662dcba7e08a75397a45f3ca4cbe980608c4 Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Tue, 29 Dec 2020 23:14:48 +0530 Subject: [PATCH 02/18] Add abc.jpg to be committed. --- abc.jpg | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 abc.jpg diff --git a/abc.jpg b/abc.jpg new file mode 100644 index 000000000..e69de29bb From 1841973ac752bcf19d434fda25284252dc06281c Mon Sep 17 00:00:00 2001 From: IshitaTandon <36607338+IshitaTandon@users.noreply.github.com> Date: Wed, 30 Dec 2020 00:20:40 +0530 Subject: [PATCH 03/18] Update README2.md --- README2.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README2.md b/README2.md index e69de29bb..16a180bf3 100644 --- a/README2.md +++ b/README2.md @@ -0,0 +1,2 @@ +Hello World!! +This is done for pulling..have a nice day. From 4050642d4cd8d3766c5670b263e6b6d8ca9838ad Mon Sep 17 00:00:00 2001 From: IshitaTandon <36607338+IshitaTandon@users.noreply.github.com> Date: Wed, 30 Dec 2020 10:17:43 +0530 Subject: [PATCH 04/18] Update abc.jpg --- abc.jpg | 1 + 1 file changed, 1 insertion(+) diff --git a/abc.jpg b/abc.jpg index e69de29bb..9ab337a80 100644 --- a/abc.jpg +++ b/abc.jpg @@ -0,0 +1 @@ +y6yt From 5304d806943c0e4f21f0da4c457289bf6d5ee76f Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Sun, 3 Jan 2021 17:19:50 +0530 Subject: [PATCH 05/18] Commit Done for Repo A --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 343480ce0..e864290ee 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +This ia a Demo Project list. +Merge-Conflict in Git Mega Project List ======== From 9d7aba1e3931233d9c9a8e0f1ad72ff9d7d3a2d4 Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Sun, 3 Jan 2021 17:26:15 +0530 Subject: [PATCH 06/18] Commit Done for Repo B --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index e864290ee..6bf314106 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ +<<<<<<< HEAD This ia a Demo Project list. Merge-Conflict in Git +======= +This is a Demo Project list. +Merge-Conflict in Git +>>>>>>> 84a93dc... Commit Done for Repo B Mega Project List ======== From 4e11c0d022956e6ebe9f480e8a0fc20177490f58 Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Sun, 3 Jan 2021 19:04:02 +0530 Subject: [PATCH 07/18] SECOND TIME COMMIT --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6bf314106..e4062fc87 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,15 @@ <<<<<<< HEAD This ia a Demo Project list. Merge-Conflict in Git +<<<<<<< HEAD ======= This is a Demo Project list. -Merge-Conflict in Git +Merge-Conflict in Git +A New Edit in README.md >>>>>>> 84a93dc... Commit Done for Repo B +======= +A New Edit in README.md +>>>>>>> 16d3bb4... SECOND TIME COMMIT Mega Project List ======== From 9a3410cc10106878bb4b0f6603466164d065e038 Mon Sep 17 00:00:00 2001 From: IshitaTandon <36607338+IshitaTandon@users.noreply.github.com> Date: Tue, 12 Apr 2022 00:21:33 +0530 Subject: [PATCH 08/18] Delete README2.md --- README2.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 README2.md diff --git a/README2.md b/README2.md deleted file mode 100644 index 16a180bf3..000000000 --- a/README2.md +++ /dev/null @@ -1,2 +0,0 @@ -Hello World!! -This is done for pulling..have a nice day. From 5de8994dbbdcb9dc747ecb2d1e61b40b41da60ff Mon Sep 17 00:00:00 2001 From: IshitaTandon <36607338+IshitaTandon@users.noreply.github.com> Date: Tue, 12 Apr 2022 00:21:49 +0530 Subject: [PATCH 09/18] Delete abc.jpg --- abc.jpg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 abc.jpg diff --git a/abc.jpg b/abc.jpg deleted file mode 100644 index 9ab337a80..000000000 --- a/abc.jpg +++ /dev/null @@ -1 +0,0 @@ -y6yt From b7f0572d5e2bb9eba4b7baad5366e859230d7b09 Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Tue, 12 Apr 2022 00:58:48 +0530 Subject: [PATCH 10/18] First Commit in development branch --- file1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1.txt diff --git a/file1.txt b/file1.txt new file mode 100644 index 000000000..547fa2ba8 --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +Hello, this is the first file in development branch From 33bae6abfef93b7e468fd7971a81073efcf3380f Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Tue, 12 Apr 2022 00:59:53 +0530 Subject: [PATCH 11/18] Second commit in Feature branch --- file2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file2.txt diff --git a/file2.txt b/file2.txt new file mode 100644 index 000000000..2e6957d51 --- /dev/null +++ b/file2.txt @@ -0,0 +1 @@ +Hello, this is file2 in feature branch From 2d3f0206d89b7126e975f52c3abee8911119da08 Mon Sep 17 00:00:00 2001 From: Ishita Tandon Date: Wed, 13 Apr 2022 00:37:01 +0530 Subject: [PATCH 12/18] File added in development branch --- file3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file3.txt diff --git a/file3.txt b/file3.txt new file mode 100644 index 000000000..a53e8f895 --- /dev/null +++ b/file3.txt @@ -0,0 +1 @@ +First File in development branch From b0b7362380e12307bb9947d27e22f42900823721 Mon Sep 17 00:00:00 2001 From: IshitaTandon <36607338+IshitaTandon@users.noreply.github.com> Date: Wed, 13 Apr 2022 13:58:56 +0530 Subject: [PATCH 13/18] collab --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..b759119aa --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +Edited by collab From bc972fdff7097ca3d7768227ebc3e090b50bee91 Mon Sep 17 00:00:00 2001 From: tandonishi Date: Wed, 13 Apr 2022 14:01:22 +0530 Subject: [PATCH 14/18] Edited by owner --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..1a20cc9e2 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +Edited by owner From bc2e6393fd15504e8ec4d54129eed857e44df506 Mon Sep 17 00:00:00 2001 From: tandonishi <102988499+tandonishi@users.noreply.github.com> Date: Wed, 13 Apr 2022 23:22:20 +0530 Subject: [PATCH 15/18] Delete newfile.txt.orig --- newfile.txt.orig | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 newfile.txt.orig diff --git a/newfile.txt.orig b/newfile.txt.orig deleted file mode 100644 index e5d25c843..000000000 --- a/newfile.txt.orig +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -Edited by owner -======= -Edited by collab ->>>>>>> b0b7362380e12307bb9947d27e22f42900823721 From b732e6cd1e3696bb3c3a382d79ed2d1ceeb777ca Mon Sep 17 00:00:00 2001 From: tandonishi <102988499+tandonishi@users.noreply.github.com> Date: Wed, 13 Apr 2022 23:22:33 +0530 Subject: [PATCH 16/18] Delete newfile.txt --- newfile.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt deleted file mode 100644 index d67b8379e..000000000 --- a/newfile.txt +++ /dev/null @@ -1,2 +0,0 @@ - -Edited by owner From 210952abbee65e10412110d2b96b623996c2098c Mon Sep 17 00:00:00 2001 From: tandonishi <102988499+tandonishi@users.noreply.github.com> Date: Wed, 13 Apr 2022 23:22:50 +0530 Subject: [PATCH 17/18] Delete file3.txt --- file3.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 file3.txt diff --git a/file3.txt b/file3.txt deleted file mode 100644 index a53e8f895..000000000 --- a/file3.txt +++ /dev/null @@ -1 +0,0 @@ -First File in development branch From aa9f7d567edc235110b05b82f10d6124698680b9 Mon Sep 17 00:00:00 2001 From: tandonishi Date: Wed, 13 Apr 2022 23:26:30 +0530 Subject: [PATCH 18/18] First File Comitted in Development Branch --- file3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file3.txt diff --git a/file3.txt b/file3.txt new file mode 100644 index 000000000..b872dfda9 --- /dev/null +++ b/file3.txt @@ -0,0 +1 @@ +This file3 added in development branch !