From: Michael Fischer <hidden> Date: 2016-06-15 22:42:19
*sigh*
I got confused about git pull origin and git pull master.
Tutorial seems to tell me I should have said git pull origin
and left well enough alone.
Now I get:
fatal: you need to resolve your current index first
How do I do that?
TIA.
Michael
--
Michael Fischer Happiness is a config option.
michael@visv.net Recompile and be happy.