-
### Version
0.12.19
### Operating System
Mac OS X
### Distribution Method
dmg (Apple Silicon)
### Describe the issue
Are there any plans to update a visual conflict resolution interface? Ideall…
-
### Issue
This would be awesome to merge branches or PRs.
I would just approve the pre-made merge in the vs code merge editor, if that's possible (save merge decisions in VS Code compatible format w…
-
Our current issues with some of the conflict popups: For example when you have a task that is
being delayed and a user is trying save that delay by increasing the task end date, but somewhere
later …
-
### What feature do you want to see added?
I would like to request the addition of an autosave feature that triggers after every command execution that modifies the configuration. This feature ensure…
-
There is currently no way to resolve a conflict via changes to the filesystem (even after #725 is landed).
We need a specification and documentation as well an implementation (that works alongside …
-
Hi,
When editing a file on a local file system VSCode detects if the file was modified outside of the environment and gives a warning when saving local changes. User can then overwrite, cancel, or …
-
# Issue
The recommended resolution for issues #13125 & #15885 conflicts with the resolution for #15545.
#15545 is about the use of `"this"` as the `output.globalObject`. The fix PR #15551 was t…
-
## Description
I was preparing to create a PR to the examples folder with a project from my personal repository. I copied the contents of my realm and package into examples/gno.land/r in the main r…
-
Recently I made a change so if an external source commits to a DB that is open in DB editor, then the entire mapping is reset and the editor is refreshed. Maybe that change predates this one https://g…
-
We need a basic and agreed-upon way to make decisions and resolve conflicts as a group.
Suggestion: majority vote among github organization members.