DOC add link in the contributing doc for rebasing on master

TomDLT · TomDLT · commit fe3a99d312eb · 2016-09-30T12:41:41.000+02:00
diff --git a/doc/developers/contributing.rst b/doc/developers/contributing.rst
@@ -148,8 +148,16 @@ visibility.
 
         $ git remote add upstream https://github.com/scikit-learn/scikit-learn.git
 
-(If any of the above seems like magic to you, then look up the
-`Git documentation <https://git-scm.com/documentation>`_ on the web.)
+If any of the above seems like magic to you, then look up the
+`Git documentation <https://git-scm.com/documentation>`_ on the web.
+
+If some conflicts arise between your branch and the master branch, you will need
+to `rebase your branch on master
+<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html#rebasing-on-master>`_.
+Please avoid merging master branch into yours. If you did it anyway, you can
+fix it following `this example
+<https://github.com/scikit-learn/scikit-learn/pull/7111#issuecomment-249175383>`_.
+
 
 Contributing pull requests
 --------------------------
