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
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.
A 'pull' does two things.
First it fetches the appropriate updates (which git version/OS are you using?)
from the upstream and stores them in the
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
