-
Today conflicts are detected by GitHub as merge conflicts. This roadmap item is to provide more assistance earlier in the flow and on the DevOps Center side to help identify and manage/resolve confli…
-
It would be useful to have a tool that explains merge conflicts in a real-life context:
e.g
This item is both `here` and `there`. Where should it be?
-
The conflict resolution workflow is based on node-id and not visual or intuitive. Can this be improved upon.
- Visual/Aesthetic improvements?
- CRDT-esque improvements?
-
zrepl should be able to resolve replication conflicts automatically.
## Background / Use Cases
**Replication conflicts** are situations where there is *something* on the receiving side that prev…
-
Jira Link: [DB-3156](https://yugabyte.atlassian.net/browse/DB-3156)
See:
https://github.com/yugabyte/yugabyte-db/blob/dc811063af47a1727cbe59e5ce621f2e94da71c9/src/yb/docdb/wait_queue.cc#L352
https:…
-
#### Software and hardware versions
ODK Services/Tables/Survey v2.0.5, Android 6, Nexus 6
#### Problem description
When syncing changes that result in a merge conflict, 2 items result in incorre…
-
```
To be spec'ed still...
```
Original issue reported on code.google.com by `ahmed.ba...@gmail.com` on 18 Nov 2010 at 1:54
-
NB: Feature requests will only be considered if they solve a pain
# Summary
## Problem
Concurrent updates across devices can cause data loss by:
1. Dropping history (overwriting revisions)…
-
**Describe the bug**
The paragraph in the introduction describing conflict resolution stops mid-sentence: `By default, only one lock for a given hash can be acquired. What happens when a lock can't b…
-
I am trying out phoenix and examine for the first time,
I am getting a hex resolution failure.
> Failed to use "postgrex" because
> ecto (version 2.1.1) requires ~> 0.13.0
> scrivener_ecto (…