Skip to content

Commit

Permalink
Merge pull request #335 from YoeDistro/kraj/master
Browse files Browse the repository at this point in the history
Update layers and branch strategy doc
  • Loading branch information
cbrake authored Apr 16, 2020
2 parents 07027d8 + befb6d5 commit 13430a0
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
13 changes: 9 additions & 4 deletions docs/layer-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ space on github. These layers are synced every two hours with upstream since the
global namespace is kept intact, there are no conflicts. We reserve namespaces
for local branches

- `yoe/<topic>` - Distro Specific branch, needed when we have to do distro
speicific fixes which are not upstreamable, this is rare situation, secondly,
we create additional layers e.g. yoe/mut ( mut stands for "Master-Under-Test)
branches which are used for regular CI builds.
- `yoe/<topic>` - Distro Specific branch, created for yoe release we support this
has speicific fixes which are not

- upstreamable, this is rare situation
- Required for yoe and are in flight for upstream inclusion - Submissions
from yoe community

we also create additional integration branches e.g. `yoe/<branch>-next` which
are used for regular CI builds.

- `<user>/<topic>` - This namespace is reserved for developers, these are also
short lived branches primarily used for development which are deleted after
Expand Down
2 changes: 1 addition & 1 deletion sources/meta-atmel

0 comments on commit 13430a0

Please sign in to comment.