Add type mismatch handling in merge process #138
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
…to merge-different-types
…ty and efficiency
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.
Hi,
I tried to add force merge option that converts type (and respects general master preferences) in merging (fix #103 ).
Adds 3 options -- skip, always convert, ask
Some things to take care of before merging the PR:
1. The dialog box visuals can be improved(This is now fixed)2. Bulk merging with convert set to true needs to be re-run multiple times on varying length of mismatched duplicate files for testing. It needs enough time to save transaction, or I get error saying - cannot change type in loadIn mode. I verified it with 150/300 duplicates, and that worked.
3. Linting. The
npm run lintcommand was changing too many files and I was worried about messing something up.AI use transparency with github copilot edits: https://gist.github.com/mimansajaiswal/493b7e53224190967a768eccffef5295