create dev branch
add feature1
modify
conflict fixed
another dev branch
try stash