diff --git a/README.md b/README.md index 9b7465ebe89dacc7f1fc047990997089257283c8..d4f54164a02e7c04aa65ba05e39a47e179484abf 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Here is the list of current archiver appliances for wave form cluster: **ALL WaveForm have to be archived at 1Hz** (see Archive File Format below). -**Rename and Delete not supported** - see the [Archiver FAQ](https://confluence.esss.lu.se/display/SW/Archiver+FAQ#expand-Howtopauserenameordeleteapv) for more information. +**PV Rename and Delete not supported** - see the [Archiver FAQ](https://confluence.esss.lu.se/display/SW/Archiver+FAQ#expand-Howtopauserenameordeleteapv) for more information. ## Archive File format @@ -52,5 +52,7 @@ 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. +### 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 and 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).