Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update layers and branch strategy doc #335

Merged
merged 3 commits into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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