Skip to content

Home

Jump to bottom
Rolf Sander edited this page Oct 13, 2021 · 3 revisions

Welcome to the KPP wiki!

Ideas for our git workflow

  • The "git-flow" workflow is explained here:

    https://nvie.com/posts/a-successful-git-branching-model

    https://nvie.com/files/Git-branching-model.pdf

  • Most important: All new features are deactivated by default. This probably sounds very sad after you've invested many hours into a new and amazing KPP feature. However, I think this is the only way we can ensure backward compatibility. To activate a new feature, a KPP command starting with "#" can be defined. For example, Mike could create a new command "#JCULLING ON" (or something like this...).

  • We could use the branches F77, Mistra, GC_updates, and MESSY for the development. Additional branches could be created for work in progress projects, e.g., a branch "gc_jculling" for Mike. Whenever the code is tested, has no side effects, and can therefore be used in the other models as well, these branches can be merged into "dev". Whenever we make a code release, "dev" can be transferred into the "main" branch.

  • New version numbers can be assigned as git tags in the master branch. The goal is 3.0 for our joint paper.

Clone this wiki locally