There doesn't need to be a merge. Just pick the most promising version and edit it to create a new version. The old version sticks around. An add-only data structure.
What this is likely to turn into, in practice, is a forest of dead forks. Division of effort, without a combination of progress.