Added images for merge

.env

@@ -1 +0,0 @@
-added env file

.gitignore

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

ASSIGNMENT-04-09-2025.md

@@ -0,0 +1,36 @@
+## Part 1: Viewing File History
+
+![alt text](<git log --example.png>)
+![alt text](<git log -p -- example.txt.png>)
+![alt text](<git log --oneline -- example.txt.png>)
+## How many commits modified this file?
+7 commits
+
+## What differences do you see when adding the -p option?
+Shows detailed changes for each commit in the file.
+
+## Part 2: Viewing File History with Blame
+![alt text](<git blame example.txt.png>)
+![alt text](<git blame -L 1,5 example.txt.png>)
+![alt text](<git blame -e example.txt.png>)
+
+## Who changed each line of the file?
+Ajishini, Solomon
+
+## How does -L help when the file is large?
+To view the history of specific lines in a file.
+
+## What extra information does -e provide?
+
+To get the email id of the user who made the chages in the file.
+
+## Part 3: Merging Branches
+
+![alt text](<git merge.png>)
+
+## Did Git perform a fast-forward merge or a 3-way merge?
+Merge conflict
+
+## What does git log --graph --oneline --all show after the merge?
+![alt text](<git log --graph --oneline --all.png>)
+

GIT_ASSIGNMENT.md

@@ -3,27 +3,3 @@ Step 1 : Create new empty repository
 - Created a new repository named as git-practice-Ajishini
 - Created with no README, no .gitignore and no license
 - ![Repository_Screenshot](GIT_ASSIGNMENT.png)
-1. Checking Git Version
-- ![Repository_Screenshot](git_version.png) 
-2. Checking Git Status
-- ![Repository_Screenshot](git_status.png)
-3. Adding Files to Staging
-- ![Repository_Screenshot](git_add.png)
-4. Viewing Commit History
-- ![Repository_Screenshot](git_log.png)
-5. Compact History (Oneline)
-- ![Repository_Screenshot](git_log--oneline--graph.png)
-6. Visual History (Graph)
-- ![Repository_Screenshot](git_log--oneline--graph.png)
-7. Checking Differences
-- ![Repository_Screenshot](git_diff.png)
-8. Comparing Two Commits
-- ![Repository_Screenshot](git_commit-commit.png)
-9. Exploring Branches
-- ![Repository_Screenshot](git_checkout.png)
-10. Cloning a Repository
-- ![Repository_Screenshot](cloned-repo.png)
-11. Pulling the Code
-- ![Repository_Screenshot](git_pull.png)
-12. Using gitignore
-- ![Repository_Screenshot](git_ignore.png)

example.txt

@@ -0,0 +1,7 @@
+New file created
+Added to git
+Commit message
+check the status
+Switch to new branch
+Check log
+Added new line in the feature/testcase branch

new_branch.txt

@@ -1 +1 @@
-Create new text file
+Create new branch

notes.txt

@@ -1,3 +1,2 @@
 - Text file
 - Changes changed
-- new line added

readme.md

@@ -1,7 +0,0 @@
-- Created readme.md in a repo and renamed it to README.md
-- ![Repository_Screenshot](readme.png)
-- Git didn’t show changes because windows system is case-insensitive
-- Fixed it using:
-    `git mv -f readme.md README.md`
-    `git commit -m "Rename readme.md to README.md"`
-- Reason: Git is case-sensitive, but case-insensitive filesystems treat both names as the same

secret.txt

@@ -1 +0,0 @@
-this is a txt file