I like git
dev branch add
master version change
Add new feature: feature name is feature1
merge with manual
used new merge with --no-ff
merge without --no-ff
again
issue1 bug fixed