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 268826

Summary:	Not possible to make changes inside the merge conflict resolver
Product:	versioncontrol	Reporter:	Christian Lenz <chrizzly>
Component:	Git	Assignee:	Ondrej Vrabec <ovrabec>
Status:	RESOLVED DUPLICATE
Severity:	normal	CC:	git
Priority:	P3
Version:	8.2
Hardware:	PC
OS:	Other
Issue Type:	ENHANCEMENT	Exception Reporter:

Description Christian Lenz 2016-11-04 13:05:07 UTC

If you have merge conflicts and you have to resolve them, I use the merge conflict resolver with the 3 editors (From remote, Local, result). Often it is so that I want to use both, which I click on it AND i have to fix some stuff inside the result. I Expect, that I can do it right inside the result window but this result is locked. Read only. So I expect that the result file (Maybe the local file too) is NOT read only, so that I can fix some stuff after Accept both for example. Now I have to resolve them and open the file, I have to remember the name. For one file it is ok, but not for more than 1 file.

Both files are not readonly, if you use the history or the diff tool to figure out what happens there.


Regards

Chris

Comment 1 Ondrej Vrabec 2016-11-04 13:15:28 UTC


*** This bug has been marked as a duplicate of bug 243824 ***