RE: Dropbox expercience conflict, what does it mean

2020-08-17 Thread Becker, Mischa J
> -Original Message- > From: Uwe Brauer > Sent: Monday, August 17, 2020 8:20 AM > To: mercurial@mercurial-scm.org > Subject: Dropbox expercience conflict, what does it mean > > Hi > > As I said I will give dropbox a try, all users can commit none is allo

Dropbox expercience conflict, what does it mean

2020-08-17 Thread Uwe Brauer
Hi As I said I will give dropbox a try, all users can commit none is allowed to push. I just saw that in the .hg directory -rw-r--r-- 1 oub oub 432 Aug 17 13:26 undo (user2 conflicted copy 2020-08-17 1).dirstate -rw-r--r-- 1 oub oub 432 Aug 16 09:57 undo (user2 conflicted copy