Daniel Barkalow wrote: >> So, if the developer then commits on his branch on machine 1, all his >> changes get undone. This has happened to him consistently --- he is >> running git 1.4.4.1 throughout. I just reproduced it using the above, >> and I am using 1.5.0-rc2 on machine 2, and 1.4.4.1 on machine 1. > > Git gets unhappy if you push into a branch that's checked out. It doesn't > update the index or working directory, so the state after the push looks > like the user reverted the patch in the working directory and updated the > index. So you usually push into _bare_ repository, or use fetch / pull instead. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html