Git smart checkout
来源:互联网 发布:淘宝类的app难做么 编辑:程序博客网 时间:2024/06/05 20:46
down votefavorite
Intellij has a feature that's very cool in theory, called Smart Checkout. This feature kicks in when you're changing branches and you have files in the current branch that you've modified but haven't committed.
Instead of forcing you to commit, stash or shelve your changes, it stashes them for you, switches branches, then runs stash pop
in the new branch.
I guess this is what you'd want sometimes, but I ran this when switching to the wrong branch.
So, now my master
branch is all full of changes that belong in another branch, some files are reporting merge conflicts, and I have all kinds of pain.
What I want to accomplish is:
- Cleanly remove the changes from the master branch.
- Move them back to the branch where I was working.
Is there a way to do this?
0 0
- Git smart checkout
- git checkout
- Git checkout
- git checkout
- git checkout
- git checkout
- git checkout
- git# checkout
- git checkout
- git checkout
- git checkout .
- git checkout
- git checkout
- git reset &&git checkout
- git - git checkout
- git之 git checkout
- 使用git checkout 源代码
- git checkout简介
- CentOS EL6/7上Broadcom BCM43142, BCM43224, BCM43225等驱动编译安装方法
- 在地图上添加线
- BaseController的封装
- caffe其他层
- 如何在JSP页面中调用JS函数换body背景(亲测可用)
- Git smart checkout
- dubbo文档
- DotNet源码解读(一)Dictionary
- java类装载
- 剑指offer 17. 合并两个排序的链表
- butterknife的使用
- iOS HTTPS适配
- HDU- 1151 Air Raid(最小路径覆盖)
- 第三天 ado.net