search

spaceconcordia / SpacecraftSoftware

Space Concordia
Apache License 2.0
7 stars 0 forks source link

Defined a task struct and a TASK_TYPE enum. #7

Closed DYu24 closed 7 years ago

DYu24 commented 7 years ago

I apologize for my vulgarity.

philip-brink commented 7 years ago

Hey Derek, master should only be merged into when the feature is building and integrated with the rest of master. This means that all the travis builds need to succeed. If you want to merge in order to collaborate with other people who are working on the same team, just have them checkout your branch. A good convention for that is to have a feature branch (ie feature-scheduler) and then personal branches (feature-scheduler-derek, feature-scheduler-someoneElse) that you regularly merge back into the feature branch.