kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-27 16:25:21 +00:00
Code Issues Projects Releases Wiki Activity

Update config sample and collab doc (#3039)

Browse Source 
removing some old example and add info about the mastermerge label

---------

Co-authored-by: veeck <michael@veeck.de>
This commit is contained in:
Veeck
2023-02-17 19:49:36 +01:00
committed by GitHub
parent 65aa1b0ddc
commit 81244d961e
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Collaboration.md
View File

@@ -6,6 +6,7 @@ This document describes how collaborators of this repository should work togethe
- never merge without someone having approved (approving and merging from same person is allowed)
- wait for all approvals requested (or the author decides something different in the comments)
- never merge to `master`, except for releases (because of update notification)
- merges to master should be tagged with the "mastermerge" label so that the test runs through
## Issues