To answer my own question, I did myself out of this hole by making a new sandbox in the first machine, then pulling a fresh copy of the repository out.
Merge without command line git
2 ビュー (過去 30 日間)
I have a git repository on a network drive which I've been using to manage a single project from a single machine. I pulled a copy of this project onto a second more powerful machine so I could run some simulations. Later, by accident, I made some changes on the second machine and then committed and pushed back to the network repository. I don't have command line git installed and getting quickly is not an option due to the restrictions on my client's works IT.
So obviously I've broken the repository from the first machine now and it rejects all attepts to push/pull/fetch as it is unable to merge. My question is, is there any way to recover this situation, or will the repository remain permanently broken without command line git. Any suggestions gratefully received.