Skip to content

Conversation

@tapple
Copy link
Contributor

@tapple tapple commented Dec 27, 2025

Added a new information popup when a file is edited that matches a master file and has differences:

image

The options are hopefully self-explanatory:

  • Ignore or X: do nothing (same behavior as before)
  • Overwrite master: apply all changes in the viewer file to the master file
  • Compare: Open viewer file and master file in a diff editor for auditing or merging
  • Always ignore: Ignore and set a workspace-level preference to always ignore

This makes the plugin easier to use for simple users like me who:

  • mostly code in the viewer
  • Don't use require() or the preprocessor

but still want to use the plugin for:

  • easy archival to git
  • luau type-checking and linting
  • another editor option

@tapple tapple changed the title Treat the viewer file as master Add the option to treat the viewer file as master Dec 27, 2025
Copy link
Collaborator

@Rider-Linden Rider-Linden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just need the pre-commit fixed and I can merge it.

"Ignore", "Overwrite master", "Compare", "Always ignore").then(async (pick) => {

if(pick === "Always ignore") {
ConfigService.getInstance().setConfig<boolean>(ConfigKey.AskIfViewerScriptMismatchesMaster, false);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was what I was looking for. So, it will ask the first time, if I say "Always ignore" it will unset the config.

@Rider-Linden Rider-Linden merged commit 47a2919 into secondlife:develop Jan 21, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants