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 238398

Summary: More Intuitive Non-Fast Forward Update Handling
Product: versioncontrol Reporter: MattE
Component: GitAssignee: Ondrej Vrabec <ovrabec>
Status: RESOLVED FIXED    
Severity: normal CC: git
Priority: P3    
Version: 7.4   
Hardware: Macintosh   
OS: Mac OS X   
Issue Type: ENHANCEMENT Exception Reporter:

Description MattE 2013-11-15 04:17:15 UTC
If the case of a git remote push "this push will result in a fast forward update" error, the IDE should not give this cryptic error message. Instead, the IDE should say:

"The remote repository has changes which haven't been resolved locally. Would you like to pull changes from the server before pushing?" or a similar message.

Then, it will have a yes/no. Yes would open the "Pull..." window. No would close the window.
Comment 1 Ondrej Vrabec 2013-11-15 13:42:35 UTC
You probably mean a non-fast-forward update. FF on the other hand is the only supported. Makes sense.

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