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 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