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 231996

Summary:	[74cat] Branches started locally and pushed are not pullable from upstream
Product:	versioncontrol	Reporter:	misterm <misterm>
Component:	Git	Assignee:	Ondrej Vrabec <ovrabec>
Status:	RESOLVED FIXED
Severity:	normal	CC:	git, hmichel, janario, markiewb, rodrigorsantos, ryannaddy
Priority:	P3
Version:	7.4
Hardware:	PC
OS:	All
Issue Type:	DEFECT	Exception Reporter:
Bug Depends on:	234301, 234391
Bug Blocks:

Description misterm 2013-06-28 13:00:12 UTC

Steps to reproduce:

1. Create a local branch;
2. Push it;
3. Pull from upstream

An error message is displayed. When pushing a new branch, it should be add to .git/config - there might be a checkbox in the push dialog if there is some reason this might not be desirable, but it should be the default.


Product Version = NetBeans IDE Dev (Build 20130628-216d1bc31969)
Operating System = Windows 7 version 6.1 running on amd64
Java; VM; Vendor = 1.7.0_07
Runtime = Java HotSpot(TM) 64-Bit Server VM 23.3-b01

Comment 1 markiewb 2013-08-13 21:08:48 UTC

My "workaround" is to delete the project and do a fresh clone from the remote repo.

Comment 2 Ondrej Vrabec 2013-08-22 10:48:25 UTC

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

Comment 3 markiewb 2013-08-22 19:07:16 UTC

Thank you Ondrej. I like to test it when it is integrated.

Comment 4 markiewb 2013-08-30 22:55:22 UTC

*** Bug 234225 has been marked as a duplicate of this bug. ***

Comment 5 coolcat007 2016-12-06 02:55:23 UTC

Why has this fix not been included in the latest versions of Netbeans?

Comment 6 Ondrej Vrabec 2016-12-06 07:44:29 UTC

works for me, I do this all the time:
* create a local branch
* push to upstream, accept remote tracking setup when push finishes
* now pull from upstream works fine

I suggest you file another issue with exact steps how to reproduce.