Merging Branches 1

.gitignore

@@ -0,0 +1 @@
+ese.txt

Demo/test1.js

@@ -0,0 +1,7 @@
+import React from "react";
+
+const test1 = () => {
+  return <div>test1dklfmvs;dfknlm</div>;
+};
+
+export default test1;

Demo/test2.js

@@ -0,0 +1,7 @@
+import React from "react";
+
+const test2 = () => {
+  return <div>test2</div>;
+};
+
+export default test2;

GIT_ASSIGNMENT.md

@@ -1,52 +1,98 @@
 ## Git Assignment
 
-## Git Version Check
+## 1. What is Git and Version Control
+
+1. Git helps multiple people work on the same files without losing each other's changes or creating a mess.
+2. Four students writing a group essay where each person writes different sections, but sometimes they need to edit the same paragraphs.
+3. Email creates confusion with multiple file versions and lost work, while Git tracks every change and lets everyone work together safely.
+
+## 2. Installing Git & Configuring User Info
 
 ## ![alt text](image.png)
 
-## Git Status
+3. Initializing a Repository
 
 ![alt text](image-1.png)
 
 ---
 
-## Git list
+4. Working Directory, Staging, and Commits
 
 ![alt text](image-2.png)
 
 ---
 
-## Git Add
-
 ![alt text](image-3.png)
 
 ---
 
-## Git Log
+![alt text](image-4.png)
 
----
+--
+
+5. Adding & Committing Files
+
+## ![alt text](image-5.png)
+
+![alt text](image-7.png)
 
 ## Git Log (oneline)
 
----
+## ![alt text](image-6.png)
+
+6. Viewing Commit Logs & Diffs
 
 ## Git Log (graph)
 
----
+## ![alt text](image-8.png)
 
 ## Git Diff
 
----
+## ![alt text](image-9.png)
 
-## Git Diff (commit1 vs commit2)
+## git diff <commit1> <commit2>
 
----
+![alt text](image-10.png)
 
-### Notes:
+## 7.Exploring Branches
 
-1. **Git Version Check** – Confirms the installed Git version.
-2. **Git Status** – Shows the current working tree status, including staged/unstaged changes.
-3. **Git Add** – Adds changes to the staging area, preparing them for commit.
-4. **Git Log** – Displays commit history.
-5. **Git Log (oneline/graph)** – Shows simplified or visual commit history.
-6. **Git Diff** – Shows changes between commits or working directory states.
+![alt text](image-11.png)
+![alt text](image-12.png)
+
+## 8.Cloning a Repository
+
+![alt text](image-13.png)
+
+## 9.Pull code from branch
+
+![alt text](image-14.png)
+
+![alt text](image-15.png)
+
+## 10.Checking Remote
+
+![alt text](image-16.png)
+
+## 11.Ignore
+
+![alt text](image-17.png)
+![alt text](image-18.png)
+![alt text](image-19.png)
+
+## 14: Viewing File History
+
+![alt text](image-20.png)
+![alt text](image-21.png)
+![alt text](image-22.png)
+
+## 15: Git Blame
+
+![alt text](image-23.png)
+![alt text](image-24.png)
+![alt text](image-25.png)
+
+## 16: Merging Branches
+
+![alt text](image-26.png)
+
+![alt text](image-27.png)

demo.js

@@ -0,0 +1,7 @@
+import React from "react";
+
+const demo = () => {
+  return <div>demo</div>;
+};
+
+export default demo;

todo.txt

@@ -0,0 +1,2 @@
+Modify change.
+Modify change.