Added another_master_file.txt
Added file to second branch
Hotfix changes to another_master_file.txt
Added hotfix file
hotfix.txt
Merge branch 'second_branch'
added merge conflict
Added merge conflict file
Added another merge conflict
added another merge conflict
Resolved merge conflicts