From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <10b109140807061200u7467db0dt8dadeecd9da0c333@mail.gmail.com> Date: Sun, 6 Jul 2008 21:00:29 +0200 From: "Antonin Vecera" To: "Fans of the OS Plan 9 from Bell Labs" <9fans@9fans.net> In-Reply-To: <20080706183147.GA975@shodan.homeunix.net> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <10b109140807061003m6f8b1ef7sb4fb20537f9621ec@mail.gmail.com> <98C569CF-3396-4285-BC02-F3BCDB62C448@mac.com> <10b109140807061107w707d6546o6d54cb39b0505e54@mail.gmail.com> <20080706183147.GA975@shodan.homeunix.net> Subject: Re: [9fans] replica question Topicbox-Message-UUID: dc346ea4-ead3-11e9-9d60-3106f5b1d025 On Sun, Jul 6, 2008 at 8:31 PM, Martin Neubauer wrote: > The reason there is no conflict is that the entries for rc/bin/termrc in the > replica databases on sources and on your computer are identical. Only after > termrc would change on sources a conflict would arise becase the local copy > would not match the database entry of the last pull. I begin to understand... Thanks. Antonin