Skip to content

Latest commit

 

History

History
59 lines (42 loc) · 2.54 KB

File metadata and controls

59 lines (42 loc) · 2.54 KB

Software Collaboration Guide

Beginners

If you have never used git please read the following:

Conventions:

Repository Naming:

We recommend lower_case separated by underscores:

Good: anymal_c_rsl
Bad: Anymal_c_rsl , anymal-c-rsl, ANYmal-C-RSL

Branch Naming

Branch Name: Description:
main Main branch. Don`t push to it directly.
dev/name_lower_case Continue development of an existing code within the project.
fix/name_lower_case If you found an error and want to quickly fix it.
feature/name_lower_case Develop something new not part of the code base.

Merging vs Rebasing

Strategy: Description:
Merge Use if preserving the complete history and chronological order of contributions is important
Rebase Apply always when the Merge Strategy Requirements are not fulfilled to keep the main branch clean.

Read more here.

Single Main Developer

Recommended workflows:

  • Always work on dev fix or feature.
  • Regularly merge your code into master.
  • [Optionally]: Create a pull request with yourself as the reviewer and check everything in the dif-view before merging.

Two Main Developers

  • Follow Single Main Developer guide.
  • Each pull request to main has to be approved by the other developer.

Multiple Developers

  • Add CI/CD Integration, GitHub Actions are handy.
  • Automated code-formatting and checking.
  • Automated unit testing.