search

Team2168 / 2014_Main_Robot

Code for the 2014 FRC season.
Other
2 stars 1 forks source link

Created the command for driving with the joystick, and added changes to ... #33

Closed Cooper-Halvordson closed 10 years ago

Cooper-Halvordson commented 10 years ago

...the OI

jcorcoran commented 10 years ago

Before branching, ALWAYS get your local files in sync with what's in the master branch. It will make it a lot easier for us (me) to merge your code.

git checkout master
git pull
git branch <NAME_OF_BRANCH>
git checkout <NAME_OF_BRANCH>
NotInControl commented 10 years ago

Does that always work? I know when I do this using egit... and I checkout master... it checksout my local copy.. doing a pull updates my reference copy... but leave my local version untouched. So if I branch at this point it would still be a branch off my local codebase.

In order to complete the process need to do a reset which replaces my local copy with the reference...I always do a hard reset. if not my local copy will still be the old version.

I am not sure if that is the same for the command line but I assume it is since egit is just a gui.

Sent from my Galaxy S®III

-------- Original message -------- From: James notifications@github.com Date: 02/07/2014 6:53 PM (GMT-05:00) To: Team2168/FRC2014_Main_Robot FRC2014_Main_Robot@noreply.github.com Subject: Re: [FRC2014_Main_Robot] Created the command for driving with the joystick, and added changes to ... (#33)

Before branching, ALWAYS get your local files in sync with what's in the master branch. It will make it a lot easier for us (me) to merge your code.

git checkout master git pull git branch git checkout — Reply to this email directly or view it on GitHub.

jayf99 commented 10 years ago

I think the difference between using egit and the git at command prompt is that egit keeps two copies of code on your local machine... the one you are using in eclipse and the one in your local repository. When Zach had the kids set up git at the command prompt he had them pull it down in the same directory they would use it in eclipse.

On Sat, Feb 8, 2014 at 3:27 PM, NotInControl notifications@github.comwrote:

Does that always work? I know when I do this using egit... and I checkout master... it checksout my local copy.. doing a pull updates my reference copy... but leave my local version untouched. So if I branch at this point it would still be a branch off my local codebase.

In order to complete the process need to do a reset which replaces my local copy with the reference...I always do a hard reset. if not my local copy will still be the old version.

I am not sure if that is the same for the command line but I assume it is since egit is just a gui.

Sent from my Galaxy S(R)III

-------- Original message -------- From: James notifications@github.com Date: 02/07/2014 6:53 PM (GMT-05:00) To: Team2168/FRC2014_Main_Robot FRC2014_Main_Robot@noreply.github.com Subject: Re: [FRC2014_Main_Robot] Created the command for driving with the joystick, and added changes to ... (#33)

Before branching, ALWAYS get your local files in sync with what's in the master branch. It will make it a lot easier for us (me) to merge your code.

git checkout master git pull git branch

git checkout

Reply to this email directly or view it on GitHub.

Reply to this email directly or view it on GitHubhttps://github.com/Team2168/FRC2014_Main_Robot/pull/33#issuecomment-34555049 .