Adds notes in the MR preparation template for cherry picking & conflicts resolution

Filipa Lacerdarequested to merge
improve-preparation-mr-docs into master

Adds notes:

  1. About how to get the merge commit SHA
  2. About VERSION conflicts in CE-to-EE after the version being tagged

Merge request reports