add merge
merge with no-ff
fix bug 101
stash pop with workspace change
add a and test pycharm git command
workspace
test
merge dev workspace
add ignore file