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!

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.