matlab git stash,[已解决]git stash 丢弃

执行git stash pop:licrifandeMacBook-Pro:iOS-Client crifan$ git stash pop

Auto-merging JianDao/MessageTableViewController.swift

CONFLICT (content): Merge conflict in JianDao/MessageTableViewController.swift

Auto-merging JianDao/MainViewController.swift

CONFLICT (content): Merge conflict in JianDao/MainViewController.swift

Auto-merging JianDao/JianDao/Constants.swift

CONFLICT (content): Merge conflict in JianDao/JianDao/Constants.swift

Auto-merging JianDao/JianDao/AppDelegate.swift

然后不想要当前的修改了。因为已经没用了。

但是stash pop后,stash还是存在。licrifandeMacBook-Pro:iOS-Client crifan$ git stash list

stash@{0}: WIP on master: 636bdeb fix bug 2205 unify name character rule

stash@{1}: WIP on master: 4a4e862 1. release internal test version of v1.2.0 2016.4.23 2. fix bug for no history message will always loading 3. fix bug for some time has get all message but still loading 4. optimize the multiple insert history message then scroll some distance

stash@{2}: WIP on master: cb70cbe remove app update function

stash@{3}: WIP on master: bdf4453 change Private chat not show receive name

licrifandeMacBook-Pro:iOS-Client crifan$

想要丢弃stash

drop git stashdrop [-q|--quiet] [<stash>]

Remove a single stashed state from the stash list. When no <stash> is given, it removes the latest one. i.e. stash@{0}, otherwise <stash> must be a valid stash log reference of the formstash@{<revision>}.

所以去:git stash droplicrifandeMacBook-Pro:iOS-Client crifan$ git stash drop

Dropped refs/stash@{0} (6d987977b0c1fb18def219429594298c7effb965)

licrifandeMacBook-Pro:iOS-Client crifan$ git stash list

stash@{0}: WIP on master: 4a4e862 1. release internal test version of v1.2.0 2016.4.23 2. fix bug for no history message will always loading 3. fix bug for some time has get all message but still loading 4. optimize the multiple insert history message then scroll some distance

stash@{1}: WIP on master: cb70cbe remove app update function

stash@{2}: WIP on master: bdf4453 change Private chat not show receive name

licrifandeMacBook-Pro:iOS-Client crifan$

即可。

  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值