Button "Discard local changes and reload" is confusing

[manuq]

Tested versions

• Reproducible in 4.3 stable and in 4.4 dev4

System information

Endless OS 6

Issue description

I'm mentoring in a game-dev program, where learners are using Git for collaboration. When they switch Git branches, the "Files have been modified on disk" dialog always appear. The title and message of the confirmation dialog are informative. But the options paralyze them.

In a Git switch, the "Discard local changes and reload" is what they want, because they are intentionally changing the files. But the label is confusing. What do "local changes" mean? Of course I know that it's "Discard changes made in Godot" but it can get confused by the Git local/remote concepts. Also maybe you didn't do any "local changes" to these files, it's just that the files changed on disk (exactly what the dialog title says).

Also, having Cancel as third option is confusing. Hopefully these buttons can have shorter labels. Something like "Are these external changes intended? Yes / No" or "Would you like to reload the files? Reload / Cancel" and after cancelling, let the user save each modified file instead of providing the "Keep local changes and overwrite" option.

Steps to reproduce

• Work on a project versioned with Git
• Create a new branch
• Open Godot, make some changes to the project. Commit changes
• Switch to another branch in Git while Godot is open, see the "Files have been modified on disk" dialog appear.

Minimal reproduction project (MRP)

N/A

[manuq]

Same issue although in a different situation: #96930

[tetrapod00]

I am also frequently slightly confused by these, even as an experienced user. Since #97461 was merged, I think this dialogue should at least be changed so that "What action should be taken?" is on a new line, like the other dialogue. I also think changing the content of the buttons would be good, though I'm not sure on exactly the best wording.

I marked this as "Good First Issue", which means that it is a good place to start contributing. For anyone interested, you should be able to reference the implementation of #97461 as a starting point. Note that since this is a somewhat subjective wording change, don't be surprised if your PR needs additional review to reach consensus.

[Manik2607]

I’d like to work on this issue.

I think the button labels can be made simpler and more intuitive by:

• Replace "Discard local changes and reload" with "Reload Files".
• Replace "Keep local changes and overwrite" with "Keep Changes".

This makes the dialog shorter, easier to understand, and consistent with Git terminology.
I am not sure if this would be consistent with other dialogue across godot.

[tetrapod00]

Oh, I should have checked, this is actually already fixed by #97461 in master/4.4dev5. I thought that there were two separate places that a similar dialogue was implemented.

Sorry for wasting everyone's time