-
## Description
This happened at `$WORK`, so this is a recollection. This happened while resolving another large conflict (8-sided if I remember correctly). It would be nice if we didn't panic durin…
-
_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 …
-
When will diffsitter be extended to assist git (and vcs'es) in resolving merge conflicts? Will that require an entirely different tool?
-
Conflicting files is a HUGE issue when modding Crusader Kings 3. Many, many mods interact and conflict with each other by editing the same common files. As it is right now, the only way to really deal…
-
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…
-
# Describe your concern
It's natural to provide ARIA properties on a custom element and then have the custom element implementation copy that property to a descendant. For example, aria-label, aria…
-
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…
-
`yarn` has a built-in mechanism for resolving git merge conflicts in `yarn.lock`; just running `yarn` will resolve the conflicts.
However:
- this is nowhere documented (except some AUTOMERGE [erro…
-
### The feature request
The initial dialog shown to resolve conflicts in a merge is unintuitive. The average user may assume that closing the dialog would abort the merge. The functionality in place …