On Sun, Jul 6, 2008 at 8:31 PM, Martin Neubauer <[EMAIL PROTECTED]> 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
