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 200430

Summary:	Git: push command should pop an alert upon conflicts
Product:	versioncontrol	Reporter:	blade106
Component:	Git	Assignee:	Ondrej Vrabec <ovrabec>
Status:	RESOLVED FIXED
Severity:	normal	CC:	git
Priority:	P3
Version:	7.1
Hardware:	PC
OS:	All
Issue Type:	DEFECT	Exception Reporter:

Description blade106 2011-07-27 13:10:30 UTC

On issuing «push», if the remote repository has change, it will send a conflict warning. In NB's versioncontrol, it doesn't warn about such a failure, that require to run another «pull», then the final «push».

Currently, the only way to see there was an error is to open the «Output» tab, and see if everything's good.

Comment 1 Ondrej Vrabec 2011-08-25 17:26:56 UTC

We should definitely provide some feedback.

Comment 2 Ondrej Vrabec 2011-08-29 13:43:25 UTC

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

Comment 3 Quality Engineering 2011-08-30 14:23:33 UTC

Integrated into 'main-golden'
Changeset: http://hg.netbeans.org/main-golden/rev/edbcc39898b6
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #200430 - Git: push command should pop an alert upon conflicts