Return-Path: Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id C2C29360 for ; Wed, 22 Jul 2015 22:01:33 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4A7EAE8 for ; Wed, 22 Jul 2015 22:01:33 +0000 (UTC) Received: by iecri3 with SMTP id ri3so83316358iec.2 for ; Wed, 22 Jul 2015 15:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vinumeris.com; s=google; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=DVzNGEbkpmFRz5aOAwkUiaflaEm2NiuAb9Nmgh8i2rs=; b=NOdk352xBY9b6j+HUxbhZtLdFR8Jm1SftgdUl0hUl+PXdkAry4+lxuZfizIG5Cq608 6JssxBWpshaHg9SjCPXCb9xeswG8r9ogcV1nxOMRcjiYi8zNAlth1k3RqQ5j9Uwx3S9t IB/CoJuSC0mKWBfz9O9tSWY8DWyhTdiCDzhWc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=DVzNGEbkpmFRz5aOAwkUiaflaEm2NiuAb9Nmgh8i2rs=; b=A2GgbS3vetWFwHU2KFiuBjwyXgG9W4w1dDZq8/dkFKtBSRvVIq3RsTCwrUgOfen3sf ZVidILdc4Gort6tH7vfuPLz56euav0/vD3fzJzSakMoVb96mbBWB+OK3cO9KUkdKQfCQ +T/YTJuSFgnwea+k/G85lRpHhgzrz6I+a5d8XY2JbboBP/2qlYcdLXPcUgtaPyYaVwPw L6dQtRt9uZ07cdJzl3wbSfdN8PogB3yw7/gjVE/7rCJKkD62XL7xZRkME6GBujIU/Clh bCC0PbiZlCKFq8F4zDWUP4uobc5f87ZSOODAIQUuEIF7B+4AkeCJiZF1Dg6OXf8BX0kd crBg== X-Gm-Message-State: ALoCoQme4g2z3FsNg3OiCNma6M1c481KvUt717RHELKuEk8aVjPO9FwPQfhi6C/R9gTOo0RTis2e MIME-Version: 1.0 X-Received: by 10.107.40.147 with SMTP id o141mr7953491ioo.83.1437602492844; Wed, 22 Jul 2015 15:01:32 -0700 (PDT) Received: by 10.50.108.111 with HTTP; Wed, 22 Jul 2015 15:01:32 -0700 (PDT) In-Reply-To: References: Date: Thu, 23 Jul 2015 00:01:32 +0200 Message-ID: From: Mike Hearn To: Eric Lombrozo Content-Type: multipart/alternative; boundary=001a1141d818ea2b44051b7de9a6 X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HTML_MESSAGE,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: bitcoin-dev@lists.linuxfoundation.org Subject: Re: [bitcoin-dev] Bitcoin Core and hard forks X-BeenThere: bitcoin-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Bitcoin Development Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2015 22:01:33 -0000 --001a1141d818ea2b44051b7de9a6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable > > Until we=E2=80=99re able to merge blockchain forks like we=E2=80=99re abl= e to merge git > repo forks, the safest option is no fork. > Block chain forks merge in the same way as git forks all the time, that's how the reorg algorithm works. Transactions that didn't make it into the post-reorg chain go back into the mempool and miners attempt to reinclude them: this is the "merge" process. If they now conflict with other transactions they are dropped and this is "resolving merge conflicts". However you have to want to merge with the new chain. If your software is programmed not to do that out of some bizarre belief that throttling your own user base is a good idea, then of course, no merge happens. Once you stop telling your computer to do that, you can then merge (reorg) back onto the main chain again. --001a1141d818ea2b44051b7de9a6 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Un= til we=E2=80=99re able to merge blockchain forks like we=E2=80=99re able to= merge git repo forks, the safest option is no fork.

Block chain forks merge in the same way as git = forks all the time, that's how the reorg algorithm works. Transactions = that didn't make it into the post-reorg chain go back into the mempool = and miners attempt to reinclude them: this is the "merge" process= . If they now conflict with other transactions they are dropped and this is= "resolving merge conflicts".

However yo= u have to want to merge with the new chain. If your software is programmed = not to do that out of some bizarre belief that throttling your own user bas= e is a good idea, then of course, no merge happens. Once you stop telling y= our computer to do that, you can then merge (reorg) back onto the main chai= n again.

--001a1141d818ea2b44051b7de9a6--