quaternary-game / class-work

0 stars 2 forks source link

Software Stack/Code Style #5

Closed IllustratedMan-code closed 1 year ago

IllustratedMan-code commented 1 year ago

Game Engine

Code style

john-whiting commented 1 year ago

I'll add a CONTRIBUTING.md file this weekend with all of the current standards (ignoring proposed standards).

IllustratedMan-code commented 1 year ago

We need to determine a branching strategy, I vote for Github flow.

It boils down to

john-whiting commented 1 year ago

We need to determine a branching strategy, I vote for Github flow.

It boils down to

  • Open feature branch for your change (ideally linked with issue)
  • make changes
  • Make a pull request to main
  • Get it reviewed by others
  • Merge pull request
  • Delete branch and close linked issue

I'm open to other opinions, but I'm in favor of everything except the merge into main. I typically like to have a develop branch in there instead. This allows for more testing on a combined branch before saying it is final and updating main.

I.e., branch off develop, merge into develop.

Later on, there would be a release branch off of develop that can get merged into main.

john-whiting commented 1 year ago

I think https://github.com/quaternary-game/quaternary/pull/5 and https://github.com/quaternary-game/quaternary/pull/6 address these concerns nicely. Also, the project code is in a new repository now.