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 - Offer stashing changes when merge-like actions fail
Summary: Offer stashing changes when merge-like actions fail
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 8.0
Hardware: PC Linux
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-12-19 21:01 UTC by Ondrej Vrabec
Modified: 2016-01-08 19:10 UTC (History)
2 users (show)

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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.