[MRG+1] use union merge strategy for whats_new #7896
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
|
LGTM. +1 for merge |
|
Certainly doesn't hurt to try! +1 |
|
Simpler use case is something like this: cat > mine <<EOF
An addition in mine.
And some more text.
This is the base I am not sure what so say here.
Second line with an additional paragraph. This is a long description
on some issue I once reported and fixed.
EOF
cat > base <<EOF
This is the base I am not sure what so say here.
Second line with an additional paragraph. This is a long description
on some issue I once reported and fixed.
EOF
cat > remote <<EOF
An addition in remote.
This is the base I am not sure what so say here.
Second line with an additional paragraph. This is a long description
on some issue I once reported and fixed.
EOF
git merge-file --union mine base remote
cat mineOutput: Not sure whether the lack of a new line between the two sections could be a problem. I tried more complicated scenarios that can lead to duplicated log entries (e.g. mine changes something in the last paragraph that remote changes too). I think this is worth trying though, maybe with some light monitoring of whats_new.rst. |
|
yeah we need to monitor whatsnew, but we gotta do this anyhow. Merging as we have +2, and let's see where it goes. |
sergeyf
pushed a commit
to sergeyf/scikit-learn
that referenced
this pull request
Feb 28, 2017
Sundrique
pushed a commit
to Sundrique/scikit-learn
that referenced
this pull request
Jun 14, 2017
NelleV
pushed a commit
to NelleV/scikit-learn
that referenced
this pull request
Aug 11, 2017
paulha
pushed a commit
to paulha/scikit-learn
that referenced
this pull request
Aug 19, 2017
maskani-moh
pushed a commit
to maskani-moh/scikit-learn
that referenced
this pull request
Nov 15, 2017
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.
This should get rid of many merge conflicts in whats_new.rst.
See discussion here: #7709 (comment)