Enhancement: Allow server options for automatic resolution of "Local cache of version exists" dialog - #139
Open
Sasbom wants to merge 5 commits into
Open
Conversation
…hould be resolved from server or from local
iLLiCiTiT
reviewed
Jul 21, 2026
iLLiCiTiT
reviewed
Jul 21, 2026
iLLiCiTiT
reviewed
Jul 21, 2026
iLLiCiTiT
reviewed
Jul 21, 2026
iLLiCiTiT
reviewed
Jul 21, 2026
iLLiCiTiT
reviewed
Jul 21, 2026
iLLiCiTiT
reviewed
Jul 21, 2026
Member
|
Could you please resolve conversation to mark that next round of testing/review should happen? |
Author
Done! Excuse my etiquette. Thanks for the reminder. |
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
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.
This PR adds a server option for automatically resolving the dialog that pops up when a newer, locally cached file is present.
This allows TDs setting up the plugin to be strict about there source of truth, instead of leaving it to the artist.
The PR was set up following a discussion within the community about this dialog's choice leaving a workflow vulnerable to loss of work.
The new options are disabled by default, and without enabling the "Force cache conflict source" option, in "Cache conflict resolution", the dialog will still pop up.
Thanks for your consideration,
Sas van Gulik
Changelog Description
This PR adds a server-side toggle + enum with corresponding options found in the "Local cache of version exists" dialog's buttons.
It allows the user to set a default strategy if that is wanted.
A server for fetching server options have been added to the clients api/lib.py.
Additional review information
I'm still not quite sure about the names of the options. That could be clearer, but I think this gets the points across.
Testing notes: