Commit 5cad283d authored by Guido Gunther's avatar Guido Gunther
Browse files

Contributing: we want to base our feature branches on master

Feature branches should (whenver possible) be based on upsteam's master
since

 - it eases upstream adoption
 - it makes sure features stay well separated
parent f766a63b
Pipeline #1002 passed with stage
in 3 minutes
......@@ -24,7 +24,7 @@ Test your feature. Once happy with it, try to merge it upstream and follow *upda
Updating a feature
------------------
(Basically subsystem trees in Linux). Merge *librem5* into your *f/* branch when needed. Update you feature, do another merge request against *librem5* when done.
(Basically subsystem trees in Linux). Merge *master* into your *f/* branch when needed. Update your feature, do another merge request against *librem5* when done.
Updating the Debian packaging
-----------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment