just to try
in the feature1
in the master
fix the conflicts
dev1 commit
dev2
merge
without ff
dev3
dev4
fixed
Merge branch 'master' of github.com:wuhw/crazy_for_ui