Update contributing.md

[Moderocky]

Description

Improvements to the code of conduct.

Adds details about what to expect during the review phase, and clears up some old information.

[AyhamAl-Ali]

Nice.

[TheLimeGlass]

I think you should keep the notice stating that two or more team reviews needs to pass in order for the pull request to be merged.

[Moderocky]

I think you should keep the notice stating that two or more team reviews needs to pass in order for the pull request to be merged.

That may have been removed by mistake, I was intending to move it to the end section on merging - I'll check the file itself.

Edit: nevermind it was merged into the final section :)

[TheLimeGlass]

I think you should include a note stating that they don't have to keep the pull request up to date with the master unless it has conflicts. We'll update to master before merging. This helps the developer cherry-picking if we have to port it to other versions to avoid commit searching.

[Moderocky]

Would you prefer that here or in the code conventions file?

[TheLimeGlass]

Would you prefer that here or in the code conventions file?

Here, it's this discussion.