[Bitcoin-development] RFC: MERGE transaction/script/process for forked chains

[Gregory Maxwell]

On Tue, Dec 17, 2013 at 2:41 PM, Troy Benjegerdes <hozer at hozed.org> wrote:
> I want to get some feedback.. I've used distributed version control
> systems for a long time, and the most useful feature is to be able
> to merge two different forks.

We already automatically merge forks that we become aware of simply by
pulling in all the novel non-conflicting transactions the fork
contains and including them in our next blocks.