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.
Integrated into 'main-silver', will be available in build *201407190718* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
User: Ondrej Vrabec <firstname.lastname@example.org>
Log: #245127 - Add "Git -> Resolve conflicts" button