idea 合并git中多次commit和stash

1、删除远程branch(注意不要删除本地branch)

删除远程branch

2、在log中回滚日志

TimLine截图20171109211333.png TimLine截图20171109211351.png

3、提交commit

TimLine截图20171109211603.png

4、推送push

TimLine截图20171109211631.png

---

stash用法

stash path do stash unstash path do unstash