Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-revay authored Nov 18, 2023
1 parent 6015705 commit 959d965
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ After you updated the `initPC` or `dotfiles` repo (e.g. adding a package, changi
4. **`devel`** - development and experiments, might be inconsistent or broken regularly. Useful, consistent, and fully functional changes from the branch devel might be merged into the branch testing.
5. **`devel-feature-<name of the feature>`** - all feature branches should be branched off and merged to devel. Features and bugfixes of `testing`, `stable` or `LTS` should always go through the `devel` branch first (following the change workflow below).

`LTS`, `stable`, and `testing` branches are expected to be **always in a consistent state** so that they can always be used to init a new machine e.g. VM or a bootable partition. The `devel` branch is expected to be broken from time to time (e.g. when working on larger changes "per partes") and it might not always be possible to init a machine using it. Changes are usually pushed to the `devel` branch directly, very large changes can have an individual feature branch however.
`LTS`, `stable`, and `testing` branches are expected to be _always in a consistent state_ so that they can always be used to init a new machine e.g. VM or a bootable partition. The `devel` branch is expected to be broken from time to time (e.g. when working on larger changes "per partes") and it might not always be possible to init a machine using it. Changes are usually pushed to the `devel` branch directly, very large changes can have an individual feature branch however.

✔️ *Note: By stable I mean free of unpredictable behavior and crashes, not as decribed here: https://medium.com/@gordon.messmer/what-does-stable-mean-4447ac53bac8 (TODO toread)*

Expand Down

0 comments on commit 959d965

Please sign in to comment.