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 - Git: push command should pop an alert upon conflicts
Summary: Git: push command should pop an alert upon conflicts
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.1
Hardware: PC All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-27 13:10 UTC by blade106
Modified: 2011-08-30 14:23 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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