branch
trash
merged
update
trash
trash
conflict fixed
branch
dev
merge with no-ff
branch
bug fixing
merge bugfix
conflict resolved
feature branch