## Part 1: Viewing File History


![git log -- example.txt](example1.png) 

![git log -p -- example.txt](example2.png)

![git log --oneline -- example.txt](example3.png)

![blame ](blame.png)
![blame3,5](blame-L.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)