Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[MRG] DOC change rebase to merge policy #8753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NelleV merged 2 commits into from
Apr 19, 2017
Merged

[MRG] DOC change rebase to merge policy #8753

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b735c78
DOC change rebase to merge policy
Apr 17, 2017
7953cc2
FIX remove no-ff flag
Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions doc/developers/contributing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,22 @@ If any of the above seems like magic to you, then look up the `Git documentation
<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html>`_ on the
web.

In particular, 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>`_.
If some conflicts arise between your branch and the ``master`` branch, you need
to merge ``master``. The command will be::

$ git merge master

with ``master`` being synchronized with the ``upstream``.

Subsequently, you need to solve the conflicts. You can refer to the `Git
documentation related to resolving merge conflict using the command line
<https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/>`_.

.. note::

In the past, the policy to resolve conflicts was to rebase your branch on
``master``. GitHub interface deals with merging ``master`` better than in
the past.


Contributing pull requests
Expand Down