Hi there, I've been using vcsh/mr for quite a while now on my Ubuntu 14.04 client(s).
My setup is: multiple machines (4) and a bitbucket account to keep everything in sync. However I've noticed the following: Suppose I make modifications on two machines and commit them on both. Next thing on machine A is 'mr up', which causes an automatic recursive merge. Now I can run mr push to push things to bitbucket. On machine B I run 'mr up', which brings up a merge window. I accept the merge and push the changes again to bitbucket. Coming back to machine A, running 'mr up' I have to merge again and push the changes to bitbucket... ...and here goes the loop: Next thing which occurs on machine B is a merge. I this way I can generate an infinite amount of empty merges. This only way to fix this is running git fetch origin git reset --hard origin/master on all machines... Here is an example git log # vcsh bash_user lg * 5f8f428 (HEAD, origin/master, master) Merge branch 'master' of bitbucket.org:Thubo/dotconfig.bash_user |\ | * d4cf1f8 Merge branch 'master' of bitbucket.org: Thubo/dotconfig.bash_user | |\ | |/ |/| * | 72df2b0 Merge branch 'master' of bitbucket.org: Thubo/dotconfig.bash_user |\ \ | |/ | * 69e68c4 Merge branch 'master' of bitbucket.org: Thubo/dotconfig.bash_user | |\ | |/ |/| * | 46ab5b0 Merge branch 'master' of bitbucket.org: Thubo/dotconfig.bash_user |\ \ | |/ Any ideas who to fix this? (Maybe this is a general git problem or I'm simply too stupid to use things properly - nevertheless I would like to know how I can stop this behavior ;) ) Thanks a lot in advance Cheers Matthias _______________________________________________ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
