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 it reports a merge conflict.
I can access the latest version of that file (master version), and use copy 
and paste, but of course git then says I have edited the file and I must 
either stash or commit. 
Stashing reverts me to the incorrect version of the file.
What can I do? Short of starting from scratch - the repository is about 5GB 
- 12 hours download.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to