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.
Sometimes, its a pain in the ass if you have uncommited changes and you have to pull because of change, then you have some options: Commit changes, pull again. Revert Mod., pull again Stash, pull again, Stash apply (Or for now patch/diff) This is the scenario: Uncommited files, maybe of some changes which are not for commit and not for ignore because the file is important. When I pull and select rebase, I got the message to revert changes or review them. The feature pull or fetch -> stash -> merge/rebase -> stash apply would be very nice. I think this functionality is already implemented in intelliJ :). Regards Chris
when pulling with rebase this is already done automatically if you set it in gitconfig: rebase.autostash = true
I added it via "git config rebase.autostash true" and it's inside my config, but when I do "Pull from upstream..." I got the dialog "You have local modifications.... revert, review, cancel". So It's like before, but it don't ask me anymore what I want to do, merge or rebase.
I will close this, because as Ondrej said, it should be already there. I don't got the message with the modifications. Thx and regards.