Fix contradiction between contributing doc and MR template
What does this MR do?
Fixes the contradiction between the CONTRIBUTING.md and the MR template.
Are there points in the code the reviewer needs to double check?
I expect the description in MR template is the way to go and make rebase as expected action.
Why was this MR needed?
Have the same statement in regards to solving a conflict with master for a MR.
What are the relevant issue numbers?
Screenshots (if relevant)
N/A
Does this MR meet the acceptance criteria?
-
CHANGELOG entry added -
Documentation created/updated -
API support added - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Conform by the style guides -
Branch has no merge conflicts with master
(if you do - rebase it please) -
Squashed related commits together