@@ -6,10 +6,11 @@ The Librem5 version of wlroots carries additional patches, contained in various
Branches
--------
**librem5*: Librem5 specific modifications. *master* and *f/<feature>* branches should be merged into *librem5*.
**master*: tracks upstream's master. No branches get ever merged in here.
**f/<feature>*: implements a certain feature.
**debian/sid*: The branch used for Debian packaging. Only *librem5* merges in here. Never make any changes outside of *debian/* here.
**librem5*: Librem5 specific modifications. *master* and *f/<feature>* branches should be merged into *librem5*.
**f/<feature>*: implements a certain feature. Long lived.
**debian/sid*: the branch used for Debian packaging. Only *librem5* merges in here. Never make any changes outside of *debian/* here.
**freeform*: short-lived branches implementing fixes for any of the above, except *master*.
Updating from upstream
----------------------
...
...
@@ -26,6 +27,11 @@ Updating a feature
(Basically subsystem trees in Linux). Merge *master* into your *f/* branch when needed. Update your feature, do another merge request against *librem5* when done.
Fixing an issue
---------------
Create a new branch for your fix and then make a merge request against the branch which should receive it. Remove afterwards.
