[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [be] Merge broken
From: |
Teus Benschop |
Subject: |
Re: [be] Merge broken |
Date: |
Sat, 11 Dec 2010 07:21:56 +0100 |
It looks like the master TSI project gets it changes from the same
source as the editing TSI project. If a Send/Receive is done, will both
projects send and receive their changes? That is the only way I can
think of how changes from the editing project land into the master
project if no manual merge is done. Teus.
On Fri, 2010-12-10 at 11:57 -0600, Oreo Warpok wrote:
> I have an editing TSI project that relates to our remote repository.
> And I have a master TSI project.
>
>
> If I do edits with both windows open, Merge works.
>
>
> If I do edits with only the TSI project open, when I open the TSI
> Master project, all changes magically appear there without my doing
> any merging. And it tells me all chapters before and after are also
> completely in sync.
>
>
> I also have a copy of the TSI project that I made with a file manager.
> Same thing happens with that if I choose that as the Master project.
>
>
> I probably made the TSI master project using a file manager, and not
> by initializing/copying a new project within Bibledit. I don't
> remember now. Could that be the cause of the problem?
>
>
> Phil
>
> --
> ===============
> Oreo Phil 479-524-7005
> 0857 9631 4790
>
> http://bahasakita.net
> ===============
>
>