Merge without command line git

1 view (last 30 days)
men8th
men8th on 13 Apr 2020
Answered: men8th on 14 Apr 2020
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 Comments
Walter Roberson
Walter Roberson on 13 Apr 2020
This does not sound like a MATLAB question?
men8th
men8th on 13 Apr 2020
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.

Sign in to comment.

Answers (1)

men8th
men8th on 14 Apr 2020
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.

Categories

Find more on Source Control Integration in Help Center and File Exchange

Tags

Products


Release

R2018b

Community Treasure Hunt

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

Start Hunting!