Hi all, I'm doing development work on two machines, but distinct folders. From one machine I added/committed/pushed one folder to the repo. That worked fine. >From the other machine I used git add . as I had worked in quite a few folders. commit worked fine, but push failed.
error: failed to push some refs to 'https://github.com/... hint: Updates were rejected because the remote contains work that you do not have locally. There is work not local to the second machine, but it should not be overlapping as what I'm trying to push from second machine. I don't want to do a pull tothe second machine, as I do not know what will be overwritten. I can totally understand this behavior if the files are overlapping. But not this case. Any ideas what is going wrong or what I am doing wrong? Also, is there a command sequence to allow me to see what files are conflicting? Many thanks, /tom -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/4add1d8c-6a79-4def-843f-4cbdc935b731n%40googlegroups.com.
