new file added
sample1 edited
commit by 1st
commit again by 2nd
conflict resolved
add something
commit again
add something again
b1
master
All resolved