From a82dfb6de10b3529881e743be96d6777d8891702 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 20 Jul 2020 08:42:01 -0700 Subject: [PATCH] Document not requiring r-b/a-b tags in commit messages. Since we have marge, you get a link back to the discussion acking a merge. Part-of: --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 47dbfb6..72cc8b1 100644 --- a/README.md +++ b/README.md @@ -55,3 +55,14 @@ extensions used etc. When doing so, you must give the trace a unique filename (such as moving it to a `-v2`, `-v3`, etc.) because Mesa's trace testing infrastructure caches traces by filename instead of git hash or file hash. + +## Merging changes: + +- Get an ack or r-b statement on the MR from someone before assigning + to Marge-bot. + +Since this is a repo with limited impact on other developers when we +add new traces, we want the barrier to entry to be low. No need to +git commit --amend in the r-b statement, or get broad consensus. If +you're modifying an existing trace, you should probably get an ack +from the original committer. -- GitLab