diff --git a/README.md b/README.md index 47dbfb6e9a97bb4ec83d0b4add730ed159660f41..72cc8b19bb3a84d7abb8038a90e45e4149f9dedd 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.