This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Created attachment 154633 [details] remote sync dialogs Referencing this bug 216011 https://netbeans.org/bugzilla/show_bug.cgi?id=216011 The remote Diff Viewer used in remote synchronisation has a "Take Over Local Changes" button. The meaning of this button is unclear. If the button is meant to mean. "Keep the changes made locally in Netbeans and and upload the file to the remote location". Then the wording is quite confusing to a native English speaker. To "take over" means to "take control of" it does not imply keeping your local edits. It could even be taken to mean the opposite. Far better wording would be "Keep Local Changes" or even replicating the choices available on the main Remote Synchronisation Dialogue. e.g. "No Op" "Download" "Upload" "delete" "reset changes" The above options are the choices you need to make in the main remote synchronisation dialogue, and it makes perfect sense that they are still the same choices after viewing the diff. PHP and Netbeans are amazingly good, and I thank you for the work you do!
I find the button is very confusing as well. I see the remote files pane to the left, usually associated to a "source file names" list. Local files sit where I'd expect "destination file names". Finally I see "Take over local changes" which intuitively means: "take source file (to the left) and take over the local changes made to the destination file (to the right)." As you can see, it's not exactly what it does. Changing the button to: "Keep local changes" / "Prioritise local changes" would be way more fool proof.