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.

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
merged 2 commits into from
Apr 19, 2017

Conversation

glemaitre
Copy link
Member

Reference Issue

Follow a discussion in #8568

What does this implement/fix? Explain your changes.

The current policies to solve conflicts between master and a development branch is based on git rebase. Following the discussion in #8568 , @jnothman proposes to use a git merge policy instead.

Any other comments?

I personally like the following discussion regarding the two policies.

Copy link
Member

@jnothman jnothman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me, but that's not sure surprising

to merge ``master`` into your branch with the explicit ``--no-ff`` flag. The
command will be::

$ git merge --no-ff master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you require the --no-ff flag ?

If there is a conflict, there will be no fast forward possible. Actually, even if there is no commit but some change on both branch, a fast forward will not be possible.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my mistake

@NelleV NelleV merged commit 1497724 into scikit-learn:master Apr 19, 2017
Sundrique pushed a commit to Sundrique/scikit-learn that referenced this pull request Jun 14, 2017
* DOC change rebase to merge policy

* FIX remove no-ff flag
dmohns pushed a commit to dmohns/scikit-learn that referenced this pull request Aug 7, 2017
* DOC change rebase to merge policy

* FIX remove no-ff flag
dmohns pushed a commit to dmohns/scikit-learn that referenced this pull request Aug 7, 2017
* DOC change rebase to merge policy

* FIX remove no-ff flag
NelleV pushed a commit to NelleV/scikit-learn that referenced this pull request Aug 11, 2017
* DOC change rebase to merge policy

* FIX remove no-ff flag
paulha pushed a commit to paulha/scikit-learn that referenced this pull request Aug 19, 2017
* DOC change rebase to merge policy

* FIX remove no-ff flag
maskani-moh pushed a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017
* DOC change rebase to merge policy

* FIX remove no-ff flag
jwjohnson314 pushed a commit to jwjohnson314/scikit-learn that referenced this pull request Dec 18, 2017
* DOC change rebase to merge policy

* FIX remove no-ff flag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants