As I understand it, the conflict storage handling updates are one of the blocking items for 1.7[1]. In an effort to better understand the problem, and the proposed solution, I'm writing this mail with the intent to start some discussion.
The content of notes/wc-ng/conflict-storage seem to describe the end result, but doesn't do very much to describe how to move between the current implementation to the later one. Additionally, that document still has many pending questions. So, for somebody eager to start hacking that part of the code, how would $EXPERT suggest I go about doing so? What bits are the low-hanging fruit? And where are the gotchas, where things are a bit murky? -Hyrum [1] I don't fully understand *why* this is true, just that it is. My guess is that people have thought "hey, while we're changing everything in the working copy, let's change this, too." If that is the sole reason for making 1.7 block on the conflict storage work, then I would submit that in that way lies madness, and we need to seriously rethink this dependency.