Eclipse Community Forums: EGit / JGit » Help a newbie understand a private branch of a project on GitHub

Home » Eclipse Projects » EGit / JGit » Help a newbie understand a private branch of a project on GitHub(What is the strategy, and how do I do it in Eclipse?)

Show: Today's Messages :: Show Polls :: Message Navigator

Help a newbie understand a private branch of a project on GitHub [message #1747314]

Sat, 12 November 2016 00:56

Gary Ford

Messages: 3
Registered: August 2014

Junior Member

I'm a version control/git/EGit/GitHub newbie.

I have a Java project for which I want to use an open source project (RSyntaxTextArea) that is hosted on GitHub. Using the "Clone..." button in the "Git Repositories" view in Eclipse (Neon, Mac OS) , I cloned the "master" from the project (a Gradle project) from GitHub to a git repository on my machine, and I created an Eclipse project. It appears in my Package Explorer as "RSyntaxTextArea [RSyntaxTextArea master]".

I now need to make a local feature branch for development of a new feature that is idiosyncratic to my project. I will not be sending it back to GitHub (I'm not a committer for that project).

It seems to me that during the period that I am developing my feature, which involves adding some new classes and making changes to the project's master version, the people maintaining the master on GitHub may have made changes or bug fixes. I'd like those to be reflected in my final product as well.

So my question is this: what can/should I do in Eclipse to ensure that my feature branch is eventually merged into the most up-to-date version of my local master? When or how often do I need to do this?

Thanks.

Report message to a moderator

Re: Help a newbie understand a private branch of a project on GitHub [message #1747406 is a reply to message #1747314]

Mon, 14 November 2016 10:54

Felix Dorner

Messages: 392
Registered: December 2015

Senior Member

You don't have to create a separate feature branch. You can just work in your local master branch. To update with remote changes just select the repository in the git repositories view and do "Pull..." or "Pull" from the context menu. Here's a pro tip: Don't click or do stuff that you are not 100% sure about what it's doing. So, if you want, go and try out stuff but only after pushing your work to a safe place, e.g. to some backup repository.

Report message to a moderator

Re: Help a newbie understand a private branch of a project on GitHub [message #1749112 is a reply to message #1747406]

Thu, 01 December 2016 22:19

Matthias Sohn

Messages: 1268
Registered: July 2009

Senior Member

If you first want to have a look at the new commits from upstream before you merge them you can
first use "Fetch from upstream" to fetch new commits from the upstream repository. Then you can
have a look at these commits. And then decide if you want to merge them into your local branch.

In order to understand how to work with EGit you may want to have a look at the user guide [1].

[1] https://wiki.eclipse.org/EGit/User_Guide

Report message to a moderator

Previous Topic:	jgit console
Next Topic:	How to get project created from git repository in workspace?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Thu Apr 25 00:19:29 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter