From ea63233d0e6f27adf1c6b7256e1f0998d8938df4 Mon Sep 17 00:00:00 2001 From: Benjamin Bolling <benjamin.bolling@ess.eu> Date: Thu, 29 Feb 2024 12:30:18 +0000 Subject: [PATCH] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b7465e..e84c5b5 100644 --- a/README.md +++ b/README.md @@ -52,5 +52,9 @@ When pushing to master, the PVs are automatically added to the archiver. The `process_archives.py` script looks at files that changed since last commit. All the PVs from those files are sent to the proper appliance for archiving. -PV deletion is currently not supported by the scripts. +PV deletion is currently not supported by the scripts, which includes changing names of PVs. +### Maintainer rules + +- If configuration files have PV namechanges or deletions, the merge request shall have the name of the [INFRA-ticket-number] for the PVs changing names or being deleted. +- If there are merge conflicts, the developer requesting the merge request shall resolve the conflicts on their end (preferably by re-basing to master followed by re-applying the changes from the merge request). -- GitLab