Git-Training-Hub/git-practice-NikhilSamuel
26
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

assignment 3

Browse Source
This commit is contained in:
Nikhil Samuel
2025-09-18 10:43:47 +05:30
parent e9694e4487 da019ea384
commit 26dd5270e5
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ASSIGNMENT-04-09-2025.md
View File

@@ -9,4 +9,10 @@
![blame ](blame.png) ![blame ](blame.png)
![blame3,5](blame-L.png) ![blame3,5](blame-L.png)
![blame-E](blame-E.png) ![blame-E](blame-E.png)
## Part 3: Merging Branches
![merge conflict](cmd_msg.png)
![merge conflict 1](<conflict .png>)
![git_oneline](git_oneline_graph.png)

BIN
cmd_msg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 KiB

BIN
conflict .png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

6
example.txt
View File

@@ -1,4 +1,8 @@
hello tech Thursday hello tech Thursday
tech Thursday 2 tech Thursday 2
tech Thursday 3 tech Thursday 3
helo2 helo2
tech Thursday 5
hello 4 missing
line1
line 2

BIN
git_oneline_graph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 137 KiB