The problem, if you haven't already realised, is that when git started the
second step of the pull - the merge step - it was 'mixing together' your local
version and the fetched version, and having noticed the conflicts, then left
your working directory in that 'dirty' state for you to resolve
A couple of points:
1) Because of bandwidth constraints at the time, I didn't do a clone, I did
a shallow pull when I started. Not important at the time as I only do pulls.
2) So my system is unaware of origin.
3) The branch is master,
4) In another folder I work with a different repository.
5)
Fixed my origin value and then did reset --hard origin.master and
everything works now.
This thread has been added to Favourites.
Much obliged for all the help.
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To unsubscribe from this
