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.
A branch tracking a remote branch (e.g. master tracking origin/master etc.) should have an action "Sync with Tracked" that merges the tracked branch (origin/master) into the branch (master). In other words if a fetch/pull brings changes from a remote repository the action would bring the changes also to the local branch without a need to make a checkout and merge. Of course this applies only if it ends with a FF merge (i.e. the local branch does not have any unpushed commits).
Created attachment 147722 [details] API change
need an API upgrade..., please review.
fix: http://hg.netbeans.org/core-main/rev/37093c126e19
Integrated into 'main-silver', will be available in build *201406240001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-silver/rev/37093c126e19 User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #245078 - Add "Sync with tracked branch" to popup in the repository browser the action moves the branch's head to the new commit if it is a ff merge.