@tiagobento what in case that git pull affects a dmn file, that is being edited, but contains not saved changes. Should be they lost by force or should a modal appear? I think the second one? If yes what should modal to offer to user:

• just warning and rewrite by force
• save changes first
• resolve conflicts
• ...?

Hello @tiagobento, @jomarko. There is a solution using VS Code API FileSystemWatcher implemented in the Extended Services VS Code Extension. We could replicate this for the other editors. I could move the solution to the base code vscode-extension and do only the necessary changes directly to the editors.

As for the conflict handling between file sources, there is no standard way. But, we could do something similar to this:
https://code.visualstudio.com/assets/api/ux-guidelines/examples/notification.png
It is just a matter of using a more appropriate message and accurate buttons. For example, instead of "Accept remote" - Accept local we go with Keep changes - Discard changes. Please let me know what you guys think.

@Josephblt thank you for the link for the notification example. I think, yes, this can be an acceptable solution for the ticket. My only question is, will such notification appear:

• only on explicit save request from the user? i.e. when user press Ctrl+S?
• or will such appear also when user has autosave feature turned on?

Actually this should appear whenever there are differences between sources and VS Code has focus. Let's say for example, the user reverted changes to a repository using command line. When VS Code gets it's focus back, the popup appears.