Re: [be] problem with Timezones and Send/Receive?

[David Gardner]

Hi, 
 This is where the "conflict resolution" in BE just accepting one version is
problematic. I can't quite remember how, but it is possible to set git to
use an external program to merge conflicts, such as meld, or vimdiff.
If both users are aware of the problem, and were able to use such a tool,
then changing BE to use it would save a lot of "lost changes".

If only one person were able to do that, then I'm not sure how such things
could be resolved.

David

On Sat, Dec 11, 2010 at 07:23:56AM +0100, Teus Benschop wrote:
> We have had, and still have, the same problems, but only in case both
> parties make edits in the same chapter, or rather, in the same verse,
> and do that at the same time. Bibledit-Gtk would 'automatically' resolve
> merge conflicts that arise from various edits made by various parties in
> the same verse. Our problems disappeared when all parties did not edit
> the same chapters at the same time. Teus.
> 
> On Fri, 2010-12-10 at 13:47 -0600, Oreo Warpok wrote:
> > My team and I are using the same remote repository at Sourceforge.net.
> > But I am in America and they are in Indonesia. 
> > We have been having weird problems where many of our revisions are
> > being overwritten.
> > At first I thought it might have to do with the settings for how to
> > deal with conflicts, whether to use local or remote data.
> > Now I think maybe our problem has to do with time zones.
> > 
> > 
> > My team is always working later than I am, based on date. So if I save
> > something on my Monday afternoon (Anna's Monday's night), and Anna
> > goes to work and does a Send/Receive the first thing in the day, her
> > version will overwrite all the changes I made. If I work Tuesday at
> > 8PM (Anna's Wednesday morning) we'll be working at the same time, but
> > I suspect that Anna's version will trump mine in any change I make.
> > 
> > 
> > Or perhaps our problems relate to the weird Merge bug that I asked
> > about earlier today.
> > 
> > 
> > Thanks,
> > Phil
> > 
> > -- 
> > ===============
> > Oreo Phil         479-524-7005
> >                       0857 9631 4790
> > 
> > http://bahasakita.net
> > ===============
> > 
> > 
> 
> 
>