From e152935f3f4af327dad63f96249ca07d7e45c0fc Mon Sep 17 00:00:00 2001 From: rauanium Date: Wed, 26 Jun 2024 16:20:07 +0500 Subject: [PATCH 1/9] Adding my new joke --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3a62a39..a2dc39a 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,6 @@ An SEO expert walked into a bar, pub, liquor store, brewery, alcohol, beer, whis Why did the two functions stop calling each other? Because they had constant arguments. +Why couldn’t the confirmed bachelor use Git? Because he was afraid to commit! + + From b6a6f25d55083529f7384e5338ee6f455ddfc495 Mon Sep 17 00:00:00 2001 From: rauanium Date: Wed, 26 Jun 2024 17:38:18 +0500 Subject: [PATCH 2/9] adding new line manually --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a2dc39a..36cffc3 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,6 @@ Why did the two functions stop calling each other? Because they had constant arg Why couldn’t the confirmed bachelor use Git? Because he was afraid to commit! +adding new line to pull + From 394c125e6ff25baf0135b59261e747da14f8d23f Mon Sep 17 00:00:00 2001 From: rauanium Date: Wed, 26 Jun 2024 17:40:00 +0500 Subject: [PATCH 3/9] adding new line second time to pull --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36cffc3..8122043 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ Why couldn’t the confirmed bachelor use Git? Because he was afraid to commit! adding new line to pull - +adding new line second time to pull From 66b29ae2f1ad079c77ab06ff344fc46737db5691 Mon Sep 17 00:00:00 2001 From: rauanium Date: Wed, 26 Jun 2024 18:04:17 +0500 Subject: [PATCH 4/9] adding new line third time time to pull and update my my-joke branch --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8122043..9dbec56 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,5 @@ Why couldn’t the confirmed bachelor use Git? Because he was afraid to commit! adding new line to pull adding new line second time to pull + +adding new line third time time to pull and update my my-joke branch From 5293a61bbedef7371f26e7f72b912907dff08abd Mon Sep 17 00:00:00 2001 From: rauanium Date: Thu, 27 Jun 2024 17:55:59 +0500 Subject: [PATCH 5/9] stashing line --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9dbec56..8f0233a 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,6 @@ adding new line to pull adding new line second time to pull adding new line third time time to pull and update my my-joke branch + +Adding line to stash + From 838449c83300a9fd0b23489046702f4eb7cd6000 Mon Sep 17 00:00:00 2001 From: rauanium Date: Thu, 27 Jun 2024 23:06:35 +0500 Subject: [PATCH 6/9] added line from feat-joke --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8f0233a..8056362 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ Why did the two functions stop calling each other? Because they had constant arg Why couldn’t the confirmed bachelor use Git? Because he was afraid to commit! +Adding line from feat-joke + adding new line to pull adding new line second time to pull From b86293cded8cf44bf2cf95e18ea9eeae8a3b6b70 Mon Sep 17 00:00:00 2001 From: rauanium Date: Thu, 27 Jun 2024 23:13:32 +0500 Subject: [PATCH 7/9] creating commit from feat-joke --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8056362..4e97739 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Adding line from feat-joke adding new line to pull -adding new line second time to pull +----- creating conflict ------------- adding new line third time time to pull and update my my-joke branch From ddaa0a9177890a44c81ee66bad3136056caee972 Mon Sep 17 00:00:00 2001 From: rauanium Date: Thu, 27 Jun 2024 23:24:04 +0500 Subject: [PATCH 8/9] created conflict from feat-joke --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4e97739..1b7dea2 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,5 @@ adding new line third time time to pull and update my my-joke branch Adding line to stash +----- creating conflict from feat-joke ------------- + From 99ccab485f2025be1fd064bdb483f0b5d075ab49 Mon Sep 17 00:00:00 2001 From: rauanium Date: Thu, 27 Jun 2024 23:28:47 +0500 Subject: [PATCH 9/9] created conflict from my-joke --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 4e97739..6aba325 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,8 @@ adding new line third time time to pull and update my my-joke branch Adding line to stash +----- creating conflict from my-joke ------------- +----- creating conflict from my-joke ------------- +----- creating conflict from my-joke ------------- +----- creating conflict from my-joke ------------- +----- creating conflict from my-joke -------------