Add documentation about dealing with possible conflicts when security merge train is executed
master will be updated through merge train. There's a chance of a file being modified both on Canonical and on Security, if this happens merge-train may fail when performing the merge between the two repos. Solving this will require coordination by Release Manager:
- Analyze how difficult it's to recover from breakage.
- If the conflict is easy to solved, fix it and push the changes to Security
- If the conflict is more involved, ping the developers related to the changes, if they're not available, use the dev-on-call process.
That process should be documented