Go to Post One of these years, the game piece will be an actual red herring. - Taylor [more]
Home
Go Back   Chief Delphi > Technical > Programming > Java
CD-Media   CD-Spy  
portal register members calendar search Today's Posts Mark Forums Read FAQ rules

 
Reply
Thread Tools Rate Thread Display Modes
  #1   Spotlight this post!  
Unread 21-11-2013, 17:18
Secretspy97 Secretspy97 is offline
Registered User
FRC #1126
Team Role: Programmer
 
Join Date: Oct 2011
Rookie Year: 2009
Location: New York
Posts: 25
Secretspy97 is an unknown quantity at this point
Github vs SVN

Our team is trying out Github for the season to allow multiple people to work on the code at once. In the past we have used SVN and have never had a problem with it. What are the PROS and CONS for Github and SVN and what does your team use?
Thanks
__________________
WHAT TIME IS IT?
1126
Reply With Quote
  #2   Spotlight this post!  
Unread 21-11-2013, 17:22
BigJ BigJ is offline
Registered User
AKA: Josh P.
FRC #1675 (Ultimate Protection Squad)
Team Role: Engineer
 
Join Date: Jan 2007
Rookie Year: 2007
Location: Milwaukee, WI
Posts: 947
BigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond repute
Re: Github vs SVN

First: Github is a site (that does have a client) for using a version control system called git.

Here's a good comparison of the 2: https://git.wiki.kernel.org/index.php/GitSvnComparison

In general, git can support a very branch-heavy development process more easily, and can be easier to use if you have irregular internet access (hint hint, good for at competition). Netbeans has integration for both systems too, I believe.
Reply With Quote
  #3   Spotlight this post!  
Unread 21-11-2013, 19:23
AllenGregoryIV's Avatar
AllenGregoryIV AllenGregoryIV is offline
Engineering Coach
AKA: Allen "JAG" Gregory
FRC #3847 (Spectrum)
Team Role: Coach
 
Join Date: Jul 2008
Rookie Year: 2003
Location: Texas
Posts: 2,562
AllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond reputeAllenGregoryIV has a reputation beyond repute
Send a message via AIM to AllenGregoryIV
Re: Github vs SVN

We use Github and I'm a big fan of it. It's much easier to have people doing simultaneous offline development. The website is also very handy. The client is also very nice for beginners.
__________________

Team 647 | Cyber Wolf Corps | Alumni | 2003-2006 | Shoemaker HS
Team 2587 | DiscoBots | Mentor | 2008-2011 | Rice University / Houston Food Bank
Team 3847 | Spectrum | Coach | 2012-20... | St Agnes Academy
LRI | Alamo Regional | 2014-20...
"Competition has been shown to be useful up to a certain point and no further, but cooperation, which is the thing we must strive for today, begins where competition leaves off." - Franklin D. Roosevelt
Reply With Quote
  #4   Spotlight this post!  
Unread 21-11-2013, 19:24
joelg236 joelg236 is offline
4334 Retired Mentor & Alumni
AKA: Joel Gallant
no team
Team Role: Mentor
 
Join Date: Dec 2011
Rookie Year: 2012
Location: Calgary
Posts: 733
joelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond repute
Re: Github vs SVN

http://stackoverflow.com/questions/8...han-subversion
http://programmers.stackexchange.com...etter-than-git

Git = Offline, branched, good at merging, easy to manage features, non-linear
SVN = Central, "online", bad at branching and merging, linear, good at versions

Use git if you have independent workflows. Use SVN if you want everyone to follow a strict, standard workflow.
__________________
All opinions are my own.
Reply With Quote
  #5   Spotlight this post!  
Unread 22-11-2013, 09:40
Domenic Rodriguez's Avatar
Domenic Rodriguez Domenic Rodriguez is offline
Registered User
FRC #0316 (LuNaTeCs)
Team Role: College Student
 
Join Date: Sep 2010
Rookie Year: 2011
Location: Grove City, PA
Posts: 213
Domenic Rodriguez has a spectacular aura aboutDomenic Rodriguez has a spectacular aura aboutDomenic Rodriguez has a spectacular aura about
Re: Github vs SVN

One nice thing about GitHub is that they are offering free private repositories for FRC teams and other educational groups. Details can be found here.

As for the Git vs SVN debate, I prefer Git for the reasons already stated in the posts above mine. Git's distributed model makes it possible to host our code online and still be able to commit when offline, which is very helpful when at a competition.
__________________

LuNaTeCs - Learning Under Nurturing Adults Teaching Engineering Concepts and Skills - Small and Mighty!

FRC 316 LuNaTeCs - Student (2011-2014), Lead Programmer (2011-2014), Team Captain (2013-2014), Operator (2013), Drive Coach (2014), Mentor (2015-????)
'11 Philly Regional Finalists, '13 Chestnut Hill Finalists, '13 Lenape Champions, '13 Archimedes Division, '14 Chestnut Hill Champions, '14 Lenape Champions
FTC 7071 EngiNerds - Founding Advisor (2013-2014) | FRC 5420 Velocity - Founding Advisor (2015)
Grove City College Class of '18, Electrical/Computer Engineering (B.S.E.E)

Reply With Quote
  #6   Spotlight this post!  
Unread 22-11-2013, 10:08
Jared Russell's Avatar
Jared Russell Jared Russell is offline
Taking a year (mostly) off
FRC #0254 (The Cheesy Poofs), FRC #0341 (Miss Daisy)
Team Role: Engineer
 
Join Date: Nov 2002
Rookie Year: 2001
Location: San Francisco, CA
Posts: 3,080
Jared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond reputeJared Russell has a reputation beyond repute
Re: Github vs SVN

Literally the only advantage of SVN (IMO) is that it is somewhat simpler to explain and teach to a student.

Git is better in every other way, and is not significantly more complicated to use as long as you stick to a reasonable workflow.
Reply With Quote
  #7   Spotlight this post!  
Unread 22-11-2013, 10:42
joelg236 joelg236 is offline
4334 Retired Mentor & Alumni
AKA: Joel Gallant
no team
Team Role: Mentor
 
Join Date: Dec 2011
Rookie Year: 2012
Location: Calgary
Posts: 733
joelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond reputejoelg236 has a reputation beyond repute
Quote:
Originally Posted by Jared341 View Post
Literally the only advantage of SVN (IMO) is that it is somewhat simpler to explain and teach to a student.

Git is better in every other way, and is not significantly more complicated to use as long as you stick to a reasonable workflow.
I would probably disagree that that is the only reason. SVN is much better for using a centralized workflow. There's a reason it's still popular in commercial development. It also handles versioning much better (git tags are much worse)
__________________
All opinions are my own.
Reply With Quote
  #8   Spotlight this post!  
Unread 24-11-2013, 15:13
fovea1959's Avatar
fovea1959 fovea1959 is offline
Herder of programmers
AKA: Doug Wegscheid
FRC #3620 (The Average Joes)
Team Role: Mentor
 
Join Date: Jan 2011
Rookie Year: 2011
Location: St Joseph
Posts: 336
fovea1959 will become famous soon enough
Re: Github vs SVN

Advantage of GIT: can pull master to a local copy when away at competition with no WiFi, then catch the master back up when you get home.

This from a *long* term SVN enthusiast that is going out of his comfort zone to us Git.
Reply With Quote
  #9   Spotlight this post!  
Unread 01-12-2013, 12:17
otherguy's Avatar
otherguy otherguy is offline
sparkE
AKA: James
FRC #2168 (The Aluminum Falcons)
Team Role: Mentor
 
Join Date: Feb 2010
Rookie Year: 2009
Location: CT
Posts: 434
otherguy is a splendid one to beholdotherguy is a splendid one to beholdotherguy is a splendid one to beholdotherguy is a splendid one to beholdotherguy is a splendid one to beholdotherguy is a splendid one to beholdotherguy is a splendid one to behold
Re: Github vs SVN

Not to hijack this thread... but I have an additional question that I think could aid in informing teams considering using git.

For teams that are using git, can you describe your workflow and what plugins you're using?

Our team has used eclipse with the egit plugin for the past two years. Honestly we aren't that thrilled with egit. Its only advantage IMO is that it's integrated with eclipse.

Our workflow is as follows, although honestly we haven't been terribly successful having everyone follow/understand it in the past. We maintain a master branch with known tested/working code, students branch master, add new functionality and push their new branches up to the repository. Mentors review the code, and make comments against the branches using github's "issues" system. Once any identified problems are resolved, and the code is tested, the students submit a merge request, and a mentor merges the code into the master branch.

I'm interested in knowing how other teams are using git/github, and what tools they are using, in hopes that we can improve how we collaboratively develop code.
__________________
http://team2168.org
Reply With Quote
  #10   Spotlight this post!  
Unread 01-12-2013, 12:53
Tom Bottiglieri Tom Bottiglieri is offline
Registered User
FRC #0254 (The Cheesy Poofs)
Team Role: Engineer
 
Join Date: Jan 2004
Rookie Year: 2003
Location: San Francisco, CA
Posts: 3,188
Tom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond reputeTom Bottiglieri has a reputation beyond repute
Re: Github vs SVN

We use git, and have used Github to host our "central" repository for the past few years. We planned on using pull requests to accept new code from students, but in practice given the whacky development cycle for FRC robots it was just easier to give everyone push access.

We all just use the regular old git cli tool, no need for any messy GUIs. It really doesn't take long to learn the few commands you need so we figure it's just better to teach the students the real tool than some one-off user interface.

Another great thing about git is since you have your own repository, you can make a bunch of commits in a row while you are developing something, then squash them later into a more sane change. I find myself doing this all the time during FRC development as our robot typically takes a lot of small tweaking and testing. If you wanted to do this with SVN everyone would get all of these commits.
Reply With Quote
  #11   Spotlight this post!  
Unread 01-12-2013, 14:09
Domenic Rodriguez's Avatar
Domenic Rodriguez Domenic Rodriguez is offline
Registered User
FRC #0316 (LuNaTeCs)
Team Role: College Student
 
Join Date: Sep 2010
Rookie Year: 2011
Location: Grove City, PA
Posts: 213
Domenic Rodriguez has a spectacular aura aboutDomenic Rodriguez has a spectacular aura aboutDomenic Rodriguez has a spectacular aura about
Re: Github vs SVN

We also use a shared central repository hosted on GitHub. We try to avoid working directly on the main branch, but instead work on feature branches that are eventually merged back into main when ready. This article describes the basis of our workflow. We haven't had too many students on programming for the last few years, so merging and conflicts haven't been a big issue.

As for a Git client, if I'm not working from the command line I like to use SourceTree. It's easy to use with a nice interface while still offering most of the functionality available from the command line.
__________________

LuNaTeCs - Learning Under Nurturing Adults Teaching Engineering Concepts and Skills - Small and Mighty!

FRC 316 LuNaTeCs - Student (2011-2014), Lead Programmer (2011-2014), Team Captain (2013-2014), Operator (2013), Drive Coach (2014), Mentor (2015-????)
'11 Philly Regional Finalists, '13 Chestnut Hill Finalists, '13 Lenape Champions, '13 Archimedes Division, '14 Chestnut Hill Champions, '14 Lenape Champions
FTC 7071 EngiNerds - Founding Advisor (2013-2014) | FRC 5420 Velocity - Founding Advisor (2015)
Grove City College Class of '18, Electrical/Computer Engineering (B.S.E.E)

Reply With Quote
Reply


Thread Tools
Display Modes Rate This Thread
Rate This Thread:

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

vB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Forum Jump


All times are GMT -5. The time now is 13:02.

The Chief Delphi Forums are sponsored by Innovation First International, Inc.


Powered by vBulletin® Version 3.6.4
Copyright ©2000 - 2017, Jelsoft Enterprises Ltd.
Copyright © Chief Delphi