Skip conflict when content is identical#1082
Open
alexanderadam wants to merge 2 commits intostandardnotes:mainfrom
Open
Skip conflict when content is identical#1082alexanderadam wants to merge 2 commits intostandardnotes:mainfrom
alexanderadam wants to merge 2 commits intostandardnotes:mainfrom
Conversation
bypass sync_conflict in TimeDifferenceFilter if encrypted content and enc_item_key match between incoming and existing item, even when timestamps differ. prevents unecessary duplicate creation.
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 like I would expect it.
Because timestamp updates also create a conflict even if the content is the same.
This PR extends the logic slightly so that identical content won't create a sync conflict.
Currently the conflict is created, even if just the updated at timestamp was updated 🤷♂️
Maybe it's something!?
Also see PR 2996. 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