commit a dev msg
commit conflictBranch
try again conflict
try again conflict in master
fix conflict
learn no ff
merge with no-ff
i commit a bug