You are completely right. Fortunately for me, I only want to keep up with
the changes, so I only need to pull , not push. So my initial
git pull --depth 1 origin was fine. Worked for years. It was only when I
got involved in a sub-project that I added another users' topic, *without
having
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
I only use Git to get the bleeding edge version of the project.
A little while ago I added someone's topic to review the files. It has
since been removed.
It modified one file in master.
Now, when I do a pull, I get a merge conflict.
Stashing it doesn't work.
How do I fix this?
--
You received
I just use git to keep up with bleeding edge changes to a project. Don't
edit/commit or anything.
Added someone's topic to get their files for review.
Then removed the topic.
However, one file in master was changed by adding the topic. (I didn't
touch it.)
Now I can no longer do a pull because
On Friday, January 3, 2014 6:27:21 PM UTC+2, Philip Oakley wrote:
First, don't panic. Nothing is lost.
It sound like the 'pull' workflow you are using, does *not* match the
work style of the upstream project.
Having removed the topic, I only have one branch - master. Somehow, the
Just a bit more info. If I do a
git fetch
and then
git diff -- path-to-problem-file
I get no difference. But git still says I have unmerged changes.
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To unsubscribe from this group
