branch test
AND simple
& simple
conflict fixed
add merge use recursive
merge with no-ff
fixed a bug on branch-issue-101
merge bug fix 101
switch from issue-101 to dev and recover working
add a new file on feature-vulcan
merge feature-vulcan with no-ff