This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 269184

Summary: Please add option to stash while pulling with local changes
Product: versioncontrol Reporter: Christian Lenz <chrizzly>
Component: GitAssignee: Ondrej Vrabec <ovrabec>
Status: NEW ---    
Severity: normal CC: git
Priority: P3    
Version: 8.2   
Hardware: PC   
OS: Other   
Issue Type: ENHANCEMENT Exception Reporter:

Description Christian Lenz 2016-11-30 15:16:14 UTC 
Often you have the case, it is a real world case, you have locale changes and they are NOT committed, because it is not comittable because of errors or not finished yet. So nevertheless you have to pull smth and for this if there are changes in the same file, NetBeans says that you have to revert or review your changes and it will cancel the pull, until you commit your stuff. What other IDEs do I know is the same AND they have an option to make a smart pull.

So what is it, it will give you the info, plse revert or review your stuff like in NetBeans or maybe cancel for sure AND it gives you an option to stash the things before pull and maybe will automatically attach the stash after pulling again so that you don't need to do it manually. Only temp stash.

So you have uncommited changes, will pull and if you say yes pull aynway it will do a git stash -> pull -> stash pop. This would be very handy. I don't want to do it manually, I want an option for this and this is really a need to have.


Regards

Chris
Comment 1 Christian Lenz 2016-11-30 15:19:21 UTC 
It is not related to this: https://netbeans.org/bugzilla/show_bug.cgi?id=246075 because I do a pull from upstream and I think it is not a rebase or?

Maybe it is the same as the ticket above, first I forgot that I already created such ticket before, I created a lot sry for that. But when I do a pull, it is always a pull from upstream.