Remove unused merge methods #9702
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
louib
force-pushed
the
purge_merge_method
branch
from
2653177 to
759f6f8
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #9702 +/- ##
===========================================
- Coverage 64.84% 64.77% -0.08%
===========================================
Files 335 335
Lines 41087 41007 -80
===========================================
- Hits 26642 26559 -83
- Misses 14445 14448 +3 ☔ View full report in Codecov by Sentry. |
|
Agreed, there is no need for the other strategies |
louib
force-pushed
the
purge_merge_method
branch
from
759f6f8 to
439bdd5
Compare
droidmonkey
changed the title
droidmonkey
reviewed
Aug 7, 2023
Comment on lines
42
to
43
| KeepNewer, // merge history | ||
| Synchronize, // merge history keeping most recent as top entry and applying deletions |
There was a problem hiding this comment.
What is actually the difference between these two?
There was a problem hiding this comment.
This is the only difference. In a future PR, I think I will remove the MergeMode completely, and instead add a Merger option called mergeDeletions or synchronizeDeletions.
louib
force-pushed
the
purge_merge_method
branch
from
439bdd5 to
72285be
Compare
louib
force-pushed
the
purge_merge_method
branch
2 times, most recently
from
074fc34 to
7c5206d
Compare
|
I'll look to merge this soon along with the other code cleanups. Need to chop down these PR's |
louib
force-pushed
the
purge_merge_method
branch
from
7c5206d to
3a87905
Compare
louib
force-pushed
the
purge_merge_method
branch
from
3a87905 to
c25001d
Compare
droidmonkey
approved these changes
Dec 10, 2023
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.
We only use two merge methods:
SynchronizeandKeepNewer. Removing the other unused merge methods simplifies the merge code a lot. In a future PR, I will also remove the field from theGroupclass, and only allow overwriting the default on theMergerobject.This is not a breaking change since the
Groupfield was only changed from the unit tests.Testing strategy
unit tests are still passing
Type of change