git-practice-Ajishini/ASSIGNMENT-04-09-2025.md

## 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>)