[MRG] DOC change rebase to merge policy #8753
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jnothman
approved these changes
Apr 18, 2017
NelleV
reviewed
Apr 18, 2017
doc/developers/contributing.rst
Outdated
| to merge ``master`` into your branch with the explicit ``--no-ff`` flag. The | ||
| command will be:: | ||
|
|
||
| $ git merge --no-ff master |
There was a problem hiding this comment.
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.
NelleV
approved these changes
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reference Issue
Follow a discussion in #8568
What does this implement/fix? Explain your changes.
The current policies to solve conflicts between
masterand a development branch is based ongit rebase. Following the discussion in #8568 , @jnothman proposes to use agit mergepolicy instead.Any other comments?
I personally like the following discussion regarding the two policies.