From 39ec619f853eed88e44e5d5ea6c135421a63f2c8 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Dec 03 2019 20:25:26 +0000 Subject: Update README.md --- diff --git a/README.md b/README.md index ade6db7..ec9a156 100644 --- a/README.md +++ b/README.md @@ -21,17 +21,18 @@ Debugging salt on your client (the machine running the salt-minion) via: Rules and workflows ------------------- -The general workflow should be to create a branch (either directly in this repository or in another one), do your changes, recommit and create a merge request for review. This gives other team members the possibility to notice and review your changes. It even sends out Emails, so other team members get aware of changes. +The general workflow should be to create a branch (either directly in this repository or in a clone), do your changes, commit and create a merge request for review. This gives other team members the possibility to notice and review your changes. It even sends out Emails, so other team members get aware of changes. On the other side, we do not want to block anyone from being productive. So here are the general rules: -Always try to use merge requests. We allow to merge those requests on your own - but we want to make use of the benefits of merge requests (notifications, tests, visibility). +Always use merge requests. We allow to merge those requests on your own - but we want to make use of the benefits of merge requests (notifications, tests, visibility). -Changes, that require a submit request and review: +Merge requests, that require a submit request and review: * changes, that might affect a bigger amount of machines - especially, if this affects machines maintained by others * potentially dangerous stuff, that might break existing setups -Changes, that could be self-merged: +Merge requests, that could be self-merged: * emergency updates fixing something that is already broken (think about a new Gateway IP as example) +* typos * stuff that is interesting only for machines that the requester maintains * stuff that nobody was able to review for more than 2 months