update md file
@ -125,7 +125,71 @@
|
|||||||

|

|
||||||
|
|
||||||
---
|
---
|
||||||
|
## 🔀 Step 14: Performing a Merge
|
||||||
|
|
||||||
|
⚡ _I merged changes from another branch into my current branch._
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
📌 Since both branches had commits, Git created a **3-way merge commit** (not a fast-forward merge).
|
||||||
|
|
||||||
|
---
|
||||||
|
## 📜 Step 15: Inspecting Merge Commit Details
|
||||||
|
|
||||||
|
👀 _I used `git log -p -- merge.txt` to review the merge commit changes._
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
📝 Shows added and modified lines from both branches.
|
||||||
|
|
||||||
|
---
|
||||||
|
## 🗂 Step 16: Checking Simplified Log After Merge
|
||||||
|
|
||||||
|
⚡ _To quickly see the commit history after the merge, I ran:_
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
---
|
||||||
|
## 🌳 Step 17: Visualizing All Branches and Merge
|
||||||
|
|
||||||
|
🎨 Using the graph mode to visualize history clearly:
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
🌿 Shows both branches and the merge commit.
|
||||||
|
|
||||||
|
---
|
||||||
|
## Step 18: Blame – Tracking Line History
|
||||||
|
|
||||||
|
🖊 With git blame, I checked who wrote each line in merge.txt.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
🔑 Each line is attributed to its commit.
|
||||||
|
|
||||||
|
---
|
||||||
|
## 🎯 Step 19: Blame with Line Range
|
||||||
|
|
||||||
|
🎯 To narrow focus, I ran blame only for lines 1–5.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📧 Step 20: Blame with Email
|
||||||
|
|
||||||
|
📧 Finally, I checked the author emails using git blame -e.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
---
|
||||||
|
## 🔀 Step 21: Merging Branch `feature/mergeFile` into Main
|
||||||
|
|
||||||
|
⚡ _I merged the branch `feature/bugReport` into `feature/mergeFile` using the command:_
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
---
|
||||||
# ✨ Summary
|
# ✨ Summary
|
||||||
|
|
||||||
1. ✅ **Git Version Check** – Verified installation.
|
1. ✅ **Git Version Check** – Verified installation.
|
||||||
@ -139,5 +203,6 @@
|
|||||||
9. ✅ **Git Pull** – Pulled updates.
|
9. ✅ **Git Pull** – Pulled updates.
|
||||||
10. ✅ **Git Remote** – Checked remotes.
|
10. ✅ **Git Remote** – Checked remotes.
|
||||||
11. ✅ **Git Ignore** – Excluded files.
|
11. ✅ **Git Ignore** – Excluded files.
|
||||||
|
12. ✅ **Git Merge** – Performed and confirmed a 3-way merge.
|
||||||
|
13. ✅ **Git Blame** – Tracked who wrote each line (with -L and -e options).
|
||||||
---
|
---
|
BIN
git_blame_-L_1,5_merge.txt.png
Normal file
After Width: | Height: | Size: 24 KiB |
BIN
git_blame_-e_merge.txt.png
Normal file
After Width: | Height: | Size: 31 KiB |
BIN
git_blame_merge.txt.png
Normal file
After Width: | Height: | Size: 28 KiB |
BIN
git_log_--_merge.txt.png
Normal file
After Width: | Height: | Size: 42 KiB |
BIN
git_log_--oneline_--_merge.txt.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
git_log_-p_--_merge.txt.png
Normal file
After Width: | Height: | Size: 44 KiB |
BIN
git_merge.png
Normal file
After Width: | Height: | Size: 55 KiB |