fix: reduce potential conflict duplicates#2996
Open
alexanderadam wants to merge 2 commits intostandardnotes:mainfrom
Open
fix: reduce potential conflict duplicates#2996alexanderadam wants to merge 2 commits intostandardnotes:mainfrom
alexanderadam wants to merge 2 commits intostandardnotes:mainfrom
Conversation
widen active-editing window to 60s, skip duplication when local item is clean, and check all existing conflicts not just the first one
alexanderadam
changed the title
cover the dirty-check shortcut, 60s active-editing window, and multi-conflict dedup in Conflict delta
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 folks,
I got bitten by issue 4021 and I was surprised that all notes were duplicated.
According to the help these conflicts would only happen if there are any differences between the two copies" but it didn't seem to work.
This PR widens the active-editing window to 60s (20 seconds feels to quick to decide, no? Or was this based on something measureable).
Furthermore it skips the duplication when local item is clean and more importanly: check all existing conflicts (not just the first one!)
Thank you so much for SN! 🙏
Also see PR 1082. Both fixes are independent but kinda complementary
PS: I'm looking for a new adventure in case anybody is looking to hire or work with a PO/PM or Ruby/Rails/Crystal dev