From: Gregory Maxwell <gmaxwell@gmail•com>
To: Troy Benjegerdes <hozer@hozed•org>
Cc: Bitcoin Development <bitcoin-development@lists•sourceforge.net>
Subject: Re: [Bitcoin-development] RFC: MERGE transaction/script/process for forked chains
Date: Tue, 17 Dec 2013 14:48:14 -0800 [thread overview]
Message-ID: <CAAS2fgT5S8x6njU6Le9tNwR_QWnoSGzfK38VLgnFfR=p=+t72g@mail.gmail.com> (raw)
In-Reply-To: <20131217224130.GC3180@nl.grid.coop>
On Tue, Dec 17, 2013 at 2:41 PM, Troy Benjegerdes <hozer@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.
next prev parent reply other threads:[~2013-12-17 22:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 22:41 Troy Benjegerdes
2013-12-17 22:48 ` Gregory Maxwell [this message]
2013-12-18 6:03 ` Troy Benjegerdes
2013-12-17 22:48 ` Mark Friedenbach
2013-12-17 22:50 ` Luke-Jr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAAS2fgT5S8x6njU6Le9tNwR_QWnoSGzfK38VLgnFfR=p=+t72g@mail.gmail.com' \
--to=gmaxwell@gmail$(echo .)com \
--cc=bitcoin-development@lists$(echo .)sourceforge.net \
--cc=hozer@hozed$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox