unmerge Base.merge! and LibGit2.merge! #24818
Merged
Conversation
This file contains 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
rfourquet
added
kind:deprecation
StefanKarpinski
approved these changes
Nov 28, 2017
Sacha0
approved these changes
Nov 28, 2017
ararslan
approved these changes
Nov 28, 2017
quinnj
approved these changes
Nov 29, 2017
malmaud
approved these changes
Nov 29, 2017
Keno
approved these changes
Nov 29, 2017
JeffBezanson
approved these changes
Nov 29, 2017
jrevels
approved these changes
Nov 29, 2017
|
Well, that's the largest number of approvals that any PR has ever gotten 😆 |
|
That's awesome, thank you all! |
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.
LibGit2's
merge!is not really the same meaning as Base's, which I think should mostly concern data structures (Associative). LibGit2 imports Base'smerge!since #11196, but I can't find there a discution about this point. It may not be so important, but it really cluttersmerge!'s help, and I believe most users are not concerned by LibGit2.