Add contributing guideline about merge requests

CONTRIBUTING.rst:
Elaborate on when merge requests are merged using `--no-ff` or `--ff`.
7 jobs for contributing_guidelines in 29 minutes and 34 seconds (queued for 7 seconds)