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 249462

Summary: Offer stashing changes when merge-like actions fail
Product: versioncontrol Reporter: Ondrej Vrabec <ovrabec>
Component: GitAssignee: Ondrej Vrabec <ovrabec>
Status: NEW ---    
Severity: normal CC: git, markiewb
Priority: P3    
Version: 8.0   
Hardware: PC   
OS: Linux   
Issue Type: ENHANCEMENT Exception Reporter:

Description Ondrej Vrabec 2014-12-19 21:01:20 UTC
When merge/cherry-pick/rebase or another similar action fails because a clash with local modifications, offer stashing those changes before trying to continue.