Stronghold Meeting - 13-Jan-2016

From DEW Robotics
Revision as of 07:36, 24 January 2016 by Laura2014 (talk | contribs) (Programming)

Jump to: navigation, search

Competition Season Meeting

Meeting Date Meeting Time Location Attendees
TCHS Brandywine

CAD & Design

Mechanical

Programming

- A guest speaker came to speak with the Programming team. He is an expert on git.

-With the large increase in programmers this year, we were hoping to develop a better, more robust system for git to allow multiple projects to be completed at once. Branches are the perfect solution for this.
-Since we already knew the basics of git, he started by explaining branches. He went through the syntax for creating and merging branches.
-He also explained how git deals with merge conflicts, and how we can resolve them.
-Additionally, he explained two branching architectures that he has worked with. Both of them allowed for one branch to remain the "competition" branch, that holds only working code. There would then also be additional branches for features and debugging.
-The first of the architectures included merging the competition branch back onto a completed feature branch, before merging the feature onto the master. This would allow teams to work out merge conflicts on the feature branches, instead of the competition branch.
-The second architecture called for an extra branch called the integration branch that the feature branches would merge into when complete. This branch would be an exact copy of the competition branch, and any merge conflicts could be solved on this branch. Then, the integration would be merged into the master.
-We decided to use the first architecture, since it allowed for more flexibility when two projects were completed at the same time.
-He also covered how often we should commit. In a normal project, he would have advised only to commit working code. However, since our robot project has such a short timeline, and since not everyone is present at every meeting, it is most efficient for everyone to commit the code before leaving the meeting.
-This presentation was very informative and allowed us to discuss exactly how to run the programming team this year. With his ideas, we have created a much better architecture for git this year.

Strategy

Field Elements

Other



Recorded by: Date: Journal Editor: Date: