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.
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.
honzo, if you're bored sometimes you can paint an icon.
fix: http://hg.netbeans.org/core-main/rev/6905eb46d809
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