[MRG] DOC change rebase to merge policy - #8753

[MRG] DOC change rebase to merge policy#8753

NelleV merged 2 commits into

scikit-learn:masterscikit-learn/scikit-learn:masterfrom

glemaitre:merge_policiesglemaitre/scikit-learn:merge_policiesCopy head branch name to clipboard