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 245127

Summary:	Add "Git -> Resolve conflicts" button
Product:	versioncontrol	Reporter:	pekarna <pekarna>
Component:	Git	Assignee:	Ondrej Vrabec <ovrabec>
Status:	RESOLVED FIXED
Severity:	normal	CC:	git
Priority:	P3
Version:	8.0
Hardware:	All
OS:	All
Issue Type:	ENHANCEMENT	Exception Reporter:

Description pekarna 2014-06-18 18:48:37 UTC

Would be nice to have a button which would do the same as Project -> Right click -> Git -> Resolve conflicts...
which I could add to the toolbar. I believe all users of git use that a lot - esp. when combining NetBeans git integration (which is great) with git cmdline ui or other tools.

Comment 1 Ondrej Vrabec 2014-06-18 19:04:53 UTC

honzo, if you're bored sometimes you can paint an icon.

Comment 2 Ondrej Vrabec 2014-07-10 14:29:38 UTC

fix: http://hg.netbeans.org/core-main/rev/6905eb46d809

Comment 3 Quality Engineering 2014-07-19 10:16:37 UTC

Integrated into 'main-silver', will be available in build *201407190718* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/6905eb46d809
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #245127 - Add "Git -> Resolve conflicts" button