pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

fix/upstreaming-merge-conflicts #41

Merged
teutat3s merged 19 commits from refs/pull/41/head into main 2021-10-11 22:11:36 +00:00
Conversation 0 Commits 19 Files changed 5 +1 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c3461cd2c3 - Show all commits

2
doc/CONTRIBUTING.md
View file

@ -1,7 +1,7 @@
# Pull Requests # Pull Requests
## TL;DR; ## TL;DR;
- **Target Branch**: `main` - **Target Branch**: `master`
- **Merge Policy**: [`bors`][bors] is always right (→ `bors try`) - **Merge Policy**: [`bors`][bors] is always right (→ `bors try`)
- **Docs**: every changeset is expected to contain doc updates - **Docs**: every changeset is expected to contain doc updates
- **Commit Msg**: be a poet! Comprehensive and explanatory commit messages - **Commit Msg**: be a poet! Comprehensive and explanatory commit messages