From 485994b8b01e340ccfac8631be4c272f3fd32e79 Mon Sep 17 00:00:00 2001 From: Omi Date: Wed, 3 Jan 2024 18:23:42 +0530 Subject: [PATCH 1/8] feat : add Normturtle --- contributors/Normturtle/Normturtle.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/Normturtle/Normturtle.md diff --git a/contributors/Normturtle/Normturtle.md b/contributors/Normturtle/Normturtle.md new file mode 100644 index 0000000..1324df9 --- /dev/null +++ b/contributors/Normturtle/Normturtle.md @@ -0,0 +1,2 @@ +name: Omkar +github_user_name: Normturtle From 366d8a68e0640308185800f8e730272f2d793319 Mon Sep 17 00:00:00 2001 From: Omi Date: Wed, 3 Jan 2024 18:40:37 +0530 Subject: [PATCH 2/8] chore: update Issue links & info --- contributors/Normturtle/Normturtle.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors/Normturtle/Normturtle.md b/contributors/Normturtle/Normturtle.md index 1324df9..3b5bf6f 100644 --- a/contributors/Normturtle/Normturtle.md +++ b/contributors/Normturtle/Normturtle.md @@ -1,2 +1,3 @@ name: Omkar github_user_name: Normturtle +url_of_github_issue: https://github.com/NebulaTris/oss101/issues/111 From 63ca5471aad901ef4040a0a494778c8025a93cbf Mon Sep 17 00:00:00 2001 From: Omi Date: Wed, 3 Jan 2024 19:50:46 +0530 Subject: [PATCH 3/8] feat : Added 2 Gists --- gist-solutions.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 gist-solutions.md diff --git a/gist-solutions.md b/gist-solutions.md new file mode 100644 index 0000000..3e8f2f0 --- /dev/null +++ b/gist-solutions.md @@ -0,0 +1,2 @@ +Gist_1_link : https://gist.github.com/NormTurtle/a801ef43350b6200324fb08e91ff4600#file-gist-1-md +Gist_1_link : https://gist.github.com/NormTurtle/a801ef43350b6200324fb08e91ff4600#file-gist-2-md From 4d709a79ee5c33e8b44632b615f465f2b9d08010 Mon Sep 17 00:00:00 2001 From: Omi Date: Wed, 3 Jan 2024 18:40:37 +0530 Subject: [PATCH 4/8] feat : sqaushed two commits --- contributors/Normturtle/Normturtle.md | 1 + gist-solutions.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 gist-solutions.md diff --git a/contributors/Normturtle/Normturtle.md b/contributors/Normturtle/Normturtle.md index 1324df9..3b5bf6f 100644 --- a/contributors/Normturtle/Normturtle.md +++ b/contributors/Normturtle/Normturtle.md @@ -1,2 +1,3 @@ name: Omkar github_user_name: Normturtle +url_of_github_issue: https://github.com/NebulaTris/oss101/issues/111 diff --git a/gist-solutions.md b/gist-solutions.md new file mode 100644 index 0000000..3e8f2f0 --- /dev/null +++ b/gist-solutions.md @@ -0,0 +1,2 @@ +Gist_1_link : https://gist.github.com/NormTurtle/a801ef43350b6200324fb08e91ff4600#file-gist-1-md +Gist_1_link : https://gist.github.com/NormTurtle/a801ef43350b6200324fb08e91ff4600#file-gist-2-md From adfe32728634b9c8615cc3e0870226024ac8b2cb Mon Sep 17 00:00:00 2001 From: Omi Date: Thu, 4 Jan 2024 14:56:26 +0530 Subject: [PATCH 5/8] Feat : verified signed commit & add: fav lang --- contributors/Normturtle/Normturtle.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors/Normturtle/Normturtle.md b/contributors/Normturtle/Normturtle.md index 3b5bf6f..a2655cf 100644 --- a/contributors/Normturtle/Normturtle.md +++ b/contributors/Normturtle/Normturtle.md @@ -1,3 +1,4 @@ name: Omkar github_user_name: Normturtle url_of_github_issue: https://github.com/NebulaTris/oss101/issues/111 +your_favorite_programming_language: 'i am not a coder actually', but "Lua" for neovim From fcc8619c3565e559363577e6a737844998638213 Mon Sep 17 00:00:00 2001 From: Omi Date: Thu, 4 Jan 2024 18:11:00 +0530 Subject: [PATCH 6/8] Create another branch From c63031c1715040179f834540ead6a2ed57228c07 Mon Sep 17 00:00:00 2001 From: Omi Date: Thu, 4 Jan 2024 19:05:06 +0530 Subject: [PATCH 7/8] Created Conflict --- contributors/Normturtle/Conflict.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/Normturtle/Conflict.md diff --git a/contributors/Normturtle/Conflict.md b/contributors/Normturtle/Conflict.md new file mode 100644 index 0000000..1e2171d --- /dev/null +++ b/contributors/Normturtle/Conflict.md @@ -0,0 +1,2 @@ +line changed by Thrid-branch +line 2 for conflict From e67b5d641e6b99f7fed9e0e6d6d0b8ea77759c5b Mon Sep 17 00:00:00 2001 From: Omi Date: Thu, 4 Jan 2024 19:07:56 +0530 Subject: [PATCH 8/8] Created Conflict on Conflict Branch --- contributors/Normturtle/Conflict.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/Normturtle/Conflict.md b/contributors/Normturtle/Conflict.md index 1e2171d..57fabc7 100644 --- a/contributors/Normturtle/Conflict.md +++ b/contributors/Normturtle/Conflict.md @@ -1,2 +1,2 @@ -line changed by Thrid-branch +line changed For Conflict line 2 for conflict