From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Sun, 6 Jul 2008 20:31:47 +0200 From: Martin Neubauer To: Fans of the OS Plan 9 from Bell Labs <9fans@9fans.net> Message-ID: <20080706183147.GA975@shodan.homeunix.net> References: <10b109140807061003m6f8b1ef7sb4fb20537f9621ec@mail.gmail.com> <98C569CF-3396-4285-BC02-F3BCDB62C448@mac.com> <10b109140807061107w707d6546o6d54cb39b0505e54@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <10b109140807061107w707d6546o6d54cb39b0505e54@mail.gmail.com> User-Agent: Mutt/1.4.2.3i Subject: Re: [9fans] replica question Topicbox-Message-UUID: dc2cac00-ead3-11e9-9d60-3106f5b1d025 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. * Antonin Vecera (antonin.vecera@gmail.com) wrote: > There is no conflict. I copied it as you wrote. After that I had local > termrc with different time compared to termrc in sources. I did pull - > and no changes, no conflicts. I don't understand. I expected conflict > because of different modification time. > > Antonin