Question for the folks who:
- Are using git to version control their robot software, AND
- Have a team of more than one software developer, AND
- Are using github/gitlab/similar for hosting code online.
What does your workflow look like for coordinating software changes between developers, and merging those changes back together?
Traditionally I hear two camps: One involves the Github constructs of forking the repo then PR’ing specific changes back. Another involves adding permissions to the main repo for everyone, having folks push development branches for their own work, and eventually working together to execute merges back to a special “integration” or “mainline” branch.
Does your team do either of these? Or something else?
And, most importantly: why?