[LUNA] Github question

[John Price]

I thought that he was developing his robot code with his robot buddies. ;-)

I'm working on a project now with me and another guy and we choose to do
pull requests (even though I don't really have to) cause it lets the
other(s) know what you are merging and why. Better communication.

If it's just you, no need for pull requests, or even branches really. Just
commit and push everything to the master branch.  That's the way I did it
before I got help.



On Tue, Sep 29, 2015 at 7:23 AM, cyberdork33 <cyberdork33 at gmail.com> wrote:

> John has the typical workflow, except I would say that you only need the
> pull request if you are trying to merge changes into a repo that is
> controlled by someone else, not your own repo (unless I am missing
> something there.) I think the key here is that you only need one remote
> repository. Create a branch and work within that branch until you have a
> code unit that is ready to merge into the master branch. Then merge and
> push to the server. This keeps the published code clean even while you are
> working on a new additions.
>
> > On Sep 28, 2015, at 11:49 PM, Michael W. Hall <hallmw at att.net> wrote:
> >
> > Think I have it now.  I created the repository.  Cloned the new FTC to
> > my machine.  Copied the code I had in ftc_app to FTC.  I did a git add
> > *.  Then I did a git commit.  I just did a git push origin master and it
> > appears to be working.
> >
> >
> > On Mon, 2015-09-28 at 23:24 -0500, John Price wrote:
> >> 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
> >
> >> _______________________________________________
> >> 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
>
> _______________________________________________
> 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/20150929/7e59e727/attachment.html>