Merge without command line git

조회 수: 1 (최근 30일)
men8th . 2020년 4월 13일
답변: men8th . 2020년 4월 14일
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.
  댓글 수: 2
men8th 2020년 4월 13일
True, but I fear that the peculiarities of the situation might be lost on the audience if I post the same question on a git forum. Might be the best bet though, I'll have a go tomorrow.

댓글을 달려면 로그인하십시오.

답변 (1개)

men8th 2020년 4월 14일
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.


Help CenterFile Exchange에서 Source Control Integration에 대해 자세히 알아보기





Community Treasure Hunt

Find the treasures in MATLAB Central and discover how the community can help you!

Start Hunting!

Translated by