add
add
merge conflict 1
master conflict
conflict solved
no ff
merge wiht no-ff
stash
stash
no ff merge
git branch