Add a new file
Delete new_file
Add file 1
Change content of file1
Rename file1 to file 2
Merge branch 'test'
Changes to file
Add YOYO to file1.txt
Resolving merge conflict
Edit a file