scm-ninja · Adhersh1901 · Jul 1, 2025 · Jul 1, 2025 · Jul 5, 2025 · Jul 5, 2025
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.orig
diff --git a/README.md b/README.md
@@ -1,7 +1,21 @@
 # Starter Web Repo
 
-This repository is for showing how Git and GitHub work
+This repository is for showing how Git and GitHub.Adding line for rebasing, more changes from feature branch. Updating for emergency fix after stashing.
+
+## Introduction
+
+This is Introductionsssssss
 
 ## Purpose
 
-Sample website with plenty of files for demos
+Sample website with plenty of files for demos..
+
+## Deployments
+Deploymentsssss
+
+## How to Contribute
+
+Git training going on
+
+### Copywright
+All rights
diff --git a/hipster.txt b/hipster.txt
@@ -0,0 +1,5 @@
+Present belly, scratch hand when stroked the door is opening! how exciting oh, it's you, meh yet climb into cupboard and lick the salt off rice cakes. The dog smells bad only use one corner of the litter box so hit you unexpectedly, meow meow leave buried treasure in the sandbox for the toddlers so meow meow mama. Good morning sunshine catch mouse and gave it as a present. Hey! you there, with the hands mouse so meow for food, then when human fills food dish, take a few bites of food and continue meowing cough hairball, eat toilet paper but brown cats with pink ears yet purr like a car engine oh yes, there is my human slave woman she does best pats ever that all i like about her hiss meow . Scratch my tummy actually i hate you now fight me sit by the fire yet lasers are tiny mice meowsiers. Hate dogs scratch at fleas, meow until belly rubs, hide behind curtain when vacuum cleaner is on scratch strangers and poo on owners food. Nap all day roll over and sun my belly. Lick sellotape headbutt owner's knee
+
+Carrying out surveillance on the neighbour's dog jump off balcony, onto stranger's head. Somehow manage to catch a bird but have no idea what to do next, so play with it until it dies of shock making sure that fluff gets into the owner's eyes meow to be let in destroy the blinds for meowing chowing and wowing lies down . Bite plants ask for petting pretend you want to go out but then don't. Sleep on keyboard sleep on keyboard, jump up to edge of bath, fall in then scramble in a mad panic to get out so sniff sniff refuse to come home when humans are going to bed; stay out all night then yowl like i am dying at 4am. 
+
+SApple pie croissant marshmallow I love jelly beans shortbread marshmallow macaroon. Biscuit sweet icing bonbon pudding. Powder lemon drops sugar plum marshmallow macaroon chupa chups muffin. Danish muffin brownie tiramisu cupcake cake macaroon donut. Gummies pie sugar plum pastry dessert dessert marshmallow. Wafer soufflé chocolate I love bear claw pudding tart candy canes. Toffee I love tiramisu tootsie roll cupcake. Muffin soufflé lollipop chocolate jujubes powder ice cream liquorice
diff --git a/humans.txt b/humans.txt
@@ -1,15 +1,7 @@
-# humanstxt.org/
-# The humans responsible & technology colophon
-
-# TEAM
-
-    <name> -- <role> -- <twitter>
-
-# THANKS
-
-    <name>
-
-# TECHNOLOGY COLOPHON
-
-    HTML5, CSS3
-    jQuery, Modernizr
+#Team
+ Adh
+#Thanks
+Thank you
+#asd
+#zxcv
+## Technology
diff --git a/index.html b/index.html
@@ -6,7 +6,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title></title>
+        <title>Title for tagging examples</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -45,7 +45,7 @@
             <div class="form-group">
               <input type="password" placeholder="Password" class="form-control">
             </div>
-            <button type="submit" class="btn btn-success">Sign in</button>
+            <button type="submit" class="btn btn-success">Login</button>
           </form>
         </div><!--/.navbar-collapse -->
       </div>

diff --git a/level1/level1.txt b/level1/level1.txt
@@ -0,0 +1 @@
+Bonbon croissant shortbread cake cake danish. Sweet roll pie fruitcake marshmallow cotton candy jelly beans shortbread. Sugar plum marshmallow candy I love halvah caramels wafer chupa chups I love. Cake powder danish jelly beans bear claw wafer candy. Jelly beans gummies sesame snaps marshmallow bear claw jelly-o gummies cake pudding. Tootsie roll fruitcake topping chupa chups ice cream gingerbread jelly-o. Sweet roll bonbon bonbon tart jelly liquorice marzipan candy canes.
diff --git a/level1/level2/level2.txt b/level1/level2/level2.txt
@@ -0,0 +1 @@
+Macaroon chocolate cake marshmallow soufflé shortbread lollipop. Dessert tootsie roll icing tart croissant topping carrot cake. Marshmallow macaroon I love cheesecake cheesecake. Tootsie roll halvah shortbread powder pudding bear claw. Bonbon pudding bonbon gummies pudding. Cookie caramels cookie carrot cake topping. Pudding topping topping I love pie I love chocolate cake caramels cheesecake. Ice cream tootsie roll pastry I love chupa chups dessert. I love I love jelly-o apple pie bear claw.
diff --git a/level1/level2/level3/lvl3.txt b/level1/level2/level3/lvl3.txt
@@ -0,0 +1 @@
+Gingerbread I love halvah I love chupa chups apple pie. Sweet I love I love marzipan lemon drops gummi bears chocolate chocolate cake. I love I love cotton candy candy canes oat cake caramels. Cake candy cake cake I love lemon drops I love donut. Candy canes halvah sugar plum bear claw tiramisu cheesecake. Lemon drops chocolate jelly-o apple pie caramels powder powder.
diff --git a/simple.html b/simple.html
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
+<!-- 
+Copyright
+Adding changes bef rebasing conflicts
+-->
 <head>
-	<title></title>
+	<title>Tagging cmp ex</title>
 	<link rel="stylesheet" href="css/bootstrap.min.css">
 	<style>
 		body {
@@ -14,11 +18,11 @@
 	<main class="container">
 	<!-- Content Goes Here -->
 		<p>
-			Just some content
+			Niceeeee adding more imp
 		</p>
 	</main>
 	<footer class="container">
-		<p>&copy; Company 2014</p>
+		<p>&copy; Company 2025,all rights res</p>
 	</footer>
 </body>
 </html>
diff --git a/starter-web b/starter-web
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Bonbon croissant shortbread cake cake danish. Sweet roll pie fruitcake marshmallow cotton candy jelly beans shortbread. Sugar plum marshmallow candy I love halvah caramels wafer chupa chups I love. Cake powder danish jelly beans bear claw wafer candy. Jelly beans gummies sesame snaps marshmallow bear claw jelly-o gummies cake pudding. Tootsie roll fruitcake topping chupa chups ice cream gingerbread jelly-o. Sweet roll bonbon bonbon tart jelly liquorice marzipan candy canes.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Macaroon chocolate cake marshmallow soufflé shortbread lollipop. Dessert tootsie roll icing tart croissant topping carrot cake. Marshmallow macaroon I love cheesecake cheesecake. Tootsie roll halvah shortbread powder pudding bear claw. Bonbon pudding bonbon gummies pudding. Cookie caramels cookie carrot cake topping. Pudding topping topping I love pie I love chocolate cake caramels cheesecake. Ice cream tootsie roll pastry I love chupa chups dessert. I love I love jelly-o apple pie bear claw.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Gingerbread I love halvah I love chupa chups apple pie. Sweet I love I love marzipan lemon drops gummi bears chocolate chocolate cake. I love I love cotton candy candy canes oat cake caramels. Cake candy cake cake I love lemon drops I love donut. Candy canes halvah sugar plum bear claw tiramisu cheesecake. Lemon drops chocolate jelly-o apple pie caramels powder powder.