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 210680

Summary:	Merge Conflict Resolver won't ask if you want to save the changes
Product:	utilities	Reporter:	Marek Fukala <mfukala>
Component:	Diff	Assignee:	Ondrej Vrabec <ovrabec>
Status:	RESOLVED FIXED
Severity:	normal	CC:	ppisl
Priority:	P2
Version:	7.2
Hardware:	PC
OS:	Mac OS X
Issue Type:	DEFECT	Exception Reporter:

Description Marek Fukala 2012-04-04 09:18:48 UTC

If one resolves conflicts in a file and then closes the window it WON'T ask the user if he wants to save the changes.

Honestly the whole workflow with the "OK" and "Cancel" button at the bottom of the page is weird. I'd expect it to be consistent with the common editor window - when user resolves at least one conflict, then the window gets "modified" status and Save action is enabled. Then when the file is closed with the modified status the common "save changes" dialog would appear.

Comment 1 Ondrej Vrabec 2012-04-04 09:51:19 UTC

org.netbeans.modules.merge.builtin.visualizer.MergeDialogComponent

Comment 2 Ondrej Vrabec 2012-04-04 13:49:32 UTC

fix: http://hg.netbeans.org/core-main/rev/1272c47d1e1b

Comment 3 Quality Engineering 2012-04-05 09:38:35 UTC

Integrated into 'main-golden', will be available in build *201204050400* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/1272c47d1e1b
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #210680 - Merge Conflict Resolver won't ask if you want to save the changes