3 ms·
I always wanted a nonlinear editor for representing stuff like different choices of wording in a song or piece of fiction. It never occurred to me that the same
by andrewflnr 14y ago
I always wanted a nonlinear editor for representing stuff like different choices of wording in a song or piece of fiction. It never occurred to me that the same idea might work for conflict resolution.
Of course, if branches could be introduced both manually and by editing conflicts, what if there are conflicts in the branches? Would it work to just simulate adding new branches as an incoming conflicting edit?