fix: do not enqueue write operations on conflict #2055
Merged
+33
−2
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
kittaakos
added
topic: code
Closes #2051 Signed-off-by: Akos Kitta <[email protected]>
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.
Motivation
To fix non-functional save behavior when a file resource has conflicts.
Change description
All write operations are queued to overcome #437. This PR ensures that when an operation is already queued and fails due to conflict, do not queue the subsequent write operation; it's already queued.
2051.mp4
Other information
arduino/arduino-ide#1972 must still work.
437_still_ok.mp4
Closes #2051
Reviewer checklist