merge_parents() => squash() #2943
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
rob-solana
force-pushed
the
merge_parents=squash
branch
from
75f0302
to
fb9b069
Compare
|
I did it for me. Carl and I, when talking, kept using "merge_from_parents()", which is the forkering terminology, and is waay wrong for current code base |
rob-solana
force-pushed
the
merge_parents=squash
branch
from
fb9b069
to
7085d2a
Compare
Codecov Report
@@ Coverage Diff @@
## master #2943 +/- ##
========================================
- Coverage 78.3% 78.3% -0.1%
========================================
Files 126 126
Lines 19604 19603 -1
========================================
- Hits 15352 15351 -1
Misses 4252 4252 |
1 similar comment
Codecov Report
@@ Coverage Diff @@
## master #2943 +/- ##
========================================
- Coverage 78.3% 78.3% -0.1%
========================================
Files 126 126
Lines 19604 19603 -1
========================================
- Hits 15352 15351 -1
Misses 4252 4252 |
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.
No description provided.