[LUNA] Github question

[John Price]

Typical process:

checkout the master branch.
create a new branch with changes you plan to make
make some changes, commit, repeat.
"push" the commits to the remote, creating a new branch on the remote,
typically with the same name as you local branch (i.e. origin/branch)
create a pull request (on the website) that merges your branch into the
master.
merge the pull request (on the website)
repeat from the top

Useful command:
git log --graph --oneline --decorate --all

This lets you see the commit graph.  take note of HEAD, master, and
origin/master.  Before you start working you probably want all those to be
pointing to the same branch (or at least be aware of where they are
pointing).



On Mon, Sep 28, 2015 at 11:06 PM, Michael W. Hall <hallmw at att.net> wrote:

> Not sure that is what I want.  I think that will notify the developers
> of the SDK about reviewing my changes.  Our changes are just for our
> robot.
>
> The ftc_app is a fork of the SDK that qualcomm developed, for the
> different robot teams to use, to write java code to control there
> robots.
>
> On Mon, 2015-09-28 at 22:00 -0500, John Price wrote:
> > Create a pull request:
> https://help.github.com/articles/using-pull-requests/
> >
> >
> >
> > On Mon, Sep 28, 2015 at 9:26 PM, Michael W. Hall <hallmw at att.net> wrote:
> >
> > > I setup a Github account for our robotics team.  I created a repository
> > > [my_github_accoun]/FTC.  I forked the robotics sdk into
> > > [my_github_accoun]/ftc_app.  I then cloned that on my machine and made
> > > some changes and pushed those changes back to
> > > [my_github_accoun]/ftc_app.  I would like to put the changes into
> > > [my_github_accoun]/FTC which I created through the Github web
> interface.
> > >
> > > I am using android studio.  Could someone tell me how to accomplish
> > > this?  I am new to using Github.  I have use git on my local machine
> but
> > > this is new to me.  TIA.
> > >
> > > Michael
> > >
> > > _______________________________________________
> > > LUNA mailing list
> > > LUNA at lunagroup.us
> > > http://lunagroup.us/mailman/listinfo/luna
> > >
> > -------------- next part --------------
> > An HTML attachment was scrubbed...
> > URL: <
> http://lunagroup.us/pipermail/luna/attachments/20150928/06fabc5c/attachment.html
> >
> > _______________________________________________
> > LUNA mailing list
> > LUNA at lunagroup.us
> > http://lunagroup.us/mailman/listinfo/luna
>
>
> _______________________________________________
> LUNA mailing list
> LUNA at lunagroup.us
> http://lunagroup.us/mailman/listinfo/luna
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lunagroup.us/pipermail/luna/attachments/20150928/028e8a2b/attachment.html>