Go to Post just remember, with power comes responsibility. - Mike Ciance [more]
Home
Go Back   Chief Delphi > Technical > Programming > NI LabVIEW
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 31-07-2015, 06:15
GuyM142's Avatar
GuyM142 GuyM142 is offline
Registered User
AKA: Guy
FRC #3339 (BumbleBee)
Team Role: Mentor
 
Join Date: Jul 2013
Rookie Year: 2012
Location: Israel
Posts: 157
GuyM142 is just really niceGuyM142 is just really niceGuyM142 is just really niceGuyM142 is just really niceGuyM142 is just really nice
Source Control help

I know there are lots of posts about this issue but all of the different posts confuse me so I need someone to focus me on this.
Until now our team didn't use any source control, we had just one project folder which we sometimes duplicated to work in parallel but it wasn't east to merge.

Next year we plan on programming more in parallel so we want to use a source control program.
I have no experience with this so I need detailed help on which option is the best and how to set it up.
If possible we prefer that the main repository will be on a local machine connected through LAN so we won't be dependent on regular internet connection.

Thank you!
__________________
2016-2017 - Programming Mentor
Curie Sub-Division Champions with 694, 379 & 1511
2015 - Team Captain & Head of Programming Crew
Carson Sub-Division Champions with 1325, 20 & 1711
First ever Israeli team on Einstein
2014 - Team Captain & Head of Programming Crew
2013 - Head of Programming Crew
2012 - Member of Programming Crew
Reply With Quote
  #2   Spotlight this post!  
Unread 31-07-2015, 23:49
jGrac jGrac is offline
Registered User
FRC #0360 (The Revolution)
Team Role: Programmer
 
Join Date: Apr 2015
Rookie Year: 2015
Location: Tacoma
Posts: 1
jGrac is an unknown quantity at this point
Re: Source Control help

Next Year we will use Github for our main source controls. First we will have a main branch that will always be competition ready code that can be run on the robot. Next we have a development branch that we have semi-ready code that we just need to test and its good on the robot. Finally we have individual branches that are used by each programmer as a day to day source control. Last we will have quick branches that are used to develop quick features/ fixes to bugs. This is a fairly common git workflow. We also will use command based next year so all that we need to do is merge the files and no copy/ pasting. Although we have no "main repo" on any one computer until week 5-6 we didn't really see a huge need for it until then. Sorry this still needs internet but if you do it correctly you really only need internet for short periods of time to upload the code.
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 10:29.

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