branch commit
conflict demo
conflict
conflict fixed
add merge
merge with no-ff
ver1
ver2
delete.txt modified
file1 added
conflict resolved
commited
merged from dev