From 0511d618cc84848dcff40d2c1f216fc5a873079f Mon Sep 17 00:00:00 2001 From: Rakshith Date: Wed, 2 Jul 2025 20:40:59 +0530 Subject: [PATCH 1/6] rakshith changed crawl.txt file --- crawl.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crawl.txt b/crawl.txt index 9e5a62c..c6bf797 100644 --- a/crawl.txt +++ b/crawl.txt @@ -1 +1,2 @@ -STAR WARS +i like batman +STAR WArS From fd5ee993e5117b742f946d0322c2a0323679dbce Mon Sep 17 00:00:00 2001 From: Rakshith Date: Wed, 2 Jul 2025 20:57:01 +0530 Subject: [PATCH 2/6] for my side branch --- forSide.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 forSide.txt diff --git a/forSide.txt b/forSide.txt new file mode 100644 index 0000000..0e9fb0e --- /dev/null +++ b/forSide.txt @@ -0,0 +1,2 @@ +this file is just for my side branch + From 2014bc01a360483d12d8d46b188c21df530b9f62 Mon Sep 17 00:00:00 2001 From: Rakshith Date: Wed, 2 Jul 2025 21:01:45 +0530 Subject: [PATCH 3/6] new file only for main branch --- forMainBranch.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 forMainBranch.txt diff --git a/forMainBranch.txt b/forMainBranch.txt new file mode 100644 index 0000000..970b8f5 --- /dev/null +++ b/forMainBranch.txt @@ -0,0 +1 @@ +this file is for my main branch From dbb7828499839fadd6e17273953a997e83161b18 Mon Sep 17 00:00:00 2001 From: Rakshith Date: Thu, 3 Jul 2025 10:39:33 +0530 Subject: [PATCH 4/6] a new txt file for my side branch --- myBranch.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 myBranch.txt diff --git a/myBranch.txt b/myBranch.txt new file mode 100644 index 0000000..770162f --- /dev/null +++ b/myBranch.txt @@ -0,0 +1,2 @@ +jdfij +ijdfijf From 0364f9348124cc908d6f150034b8b77cc575db1f Mon Sep 17 00:00:00 2001 From: Rakshith Date: Thu, 3 Jul 2025 10:45:38 +0530 Subject: [PATCH 5/6] added my name in readme --- README.md | 1 + myBranch.txt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 14eb222..fdf2c7f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +# this is for rakshith branch only # Welcome to git practice! This repo is a safe place to practice the basics of git. Try out a rebase without risking any important code! Learn how to sync from an upstream repo! Practice resolving merge conflicts! This guide assumes you have a comfortable knowledge of unix shell commands. If you want a refresher, [try here](https://github.com/you-dont-need/You-Dont-Need-GUI). This guide also assumes you have an existing github account and have [added your ssh key to it](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/). diff --git a/myBranch.txt b/myBranch.txt index 770162f..0307eae 100644 --- a/myBranch.txt +++ b/myBranch.txt @@ -1,2 +1 @@ -jdfij -ijdfijf +hi this is for my side branch From 784c08551b51655d7ca7f95db73e5324c0673a03 Mon Sep 17 00:00:00 2001 From: Rakshith Date: Thu, 3 Jul 2025 10:50:39 +0530 Subject: [PATCH 6/6] side branch file to main branch --- forSide.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forSide.txt b/forSide.txt index 0e9fb0e..3172e25 100644 --- a/forSide.txt +++ b/forSide.txt @@ -1,2 +1,2 @@ this file is just for my side branch - +but now this will go to my master branch