Ahh, I think you have a `Files` view mental model, rather than a `project` view mental model.
Git uses the `whole project` mental model, with any separation of changes being on different branches. It sounds like you haven't created a separate branch for each of the separate pieces of development (in this case `branches` =~= `refs`), so the branch at github (probably using the same name..) already contains the machine one changes, and now you want to push different changes (to the project) to the same branch, which is the conflict you see. Try changing (renaming) the machine two branch name e.g `two/name` and then push. (this assumes the typical usage where the names at github are the same as locally.. but it's totally flexible should you need to total brain-explosion). On Thursday, March 17, 2022 at 3:38:53 PM UTC iot.um...@gmail.com wrote: > 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 git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/98f5cade-5423-46d1-a4fb-32251cec2b31n%40googlegroups.com.
