This instance will be upgraded to Heptapod 0.23.2 on 2021-08-05 at 11:00 UTC+2 (a few minutes of down time)

Commit 745abe2d authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

unstable-list: add an item about author divergence resolution

parent 4c2633a8d4d0
Pipeline #12107 passed with stage
in 5 minutes and 1 second
......@@ -411,3 +411,15 @@ conflict resolution. Having some way to do that would be nice.
**Current Support Level**
Good: current implementation is expected to perform the planned stabilisation.
D-C3: Commit author conflict
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
**Stabilisation Strategy**
Merge authors using 3-way merge. If unable to merge we concatenate
the two, separated by comma. (for e.g. "John Doe, Malcolm X")
**Current Support Level**
Good: current implementation is expected to perform the planned stabilisation.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment