Peano
Loading...
Searching...
No Matches
Version Control (Git)

The project is hosted on GitHub.

You find the repository at https://github.com/tobiasweinzierl/peano. We try to give all interested colleagues access to the repository including some write permissions, but we do protect some branches. If you want to have write access to a certain branch, please contact the team, and we will subsequently assign you a user name through GitInvite.

Branch structure

Our main branch is called p4, as we work with Peano 4. This one is protected and serves as our release branch. The old main branch holds the previous 3rd generation of Peano. We do not maintain it anymore. This old version also does not contain any extension build with Peano, i.e. there's no ExaHyPE in there and no ExaParty.

dot_inline_dotgraph_4.png

The release branch p4 (dark) and the top-level branches (blue) are persistent. The subbranches (orange, dashed) are not: they are created for a particular feature or fix, merged back into their top-level branch, and then deleted. Any active user can create temporary subbranches and ask for a mege, but only few people are allowed to approve the merge. Obviously, users can fork out arbitrarily under their own temporary branches.

Naming conventions

If you create a new branch, please follow the two naming approaches:

  1. Create a hierarchical representation such as exagrype-taskgraph-bugfix which highlights that this branch is a subbranch of taskgraph which in turn is a subbranch of particles.
  2. Use your username followed by a slash as name prefix if you want to flag that you are working on this piece and noone else should interfer for the time being.

The second version puts additional emphasis on who "owns" a certain branch, while the first one highlights the hierarchical relationships. Multi-user branches or top-level branches do not have a name prefix.