-
### 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…
-
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 …
-
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 …
-
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…
-
_This issue has been moved from [a ticket on Developer Community](https://developercommunity.visualstudio.com/t/Unused-using-that-is-being-used/10659705)._
---
[severity:It bothers me. A fix would be…
-
Port [Monoid structure](https://github.com/ARK-Builders/arklib-android/blob/main/lib/src/main/java/dev/arkbuilders/arklib/data/storage/Monoid.kt) used during conflicts resolution. It's naive approach …
-
Currently, if there are conflicts, script/uplift.py will just fail, forcing the developer to perform the entire uplift process manually.
I see 480 hits for `[ERROR] cherry-pick failed for branch` i…
-
Dolt currently supports an [interactive rebase workflow](https://www.dolthub.com/blog/2024-01-03-announcing-dolt-rebase/) but if any data or schema conflicts arise, the rebase is automatically aborted…
-
When will diffsitter be extended to assist git (and vcs'es) in resolving merge conflicts? Will that require an entirely different tool?