search

JonathanReeve / sanger

Margaret Sanger Papers Project Search Engine
0 stars 3 forks source link

Digital Ocean Console - problem again #78

Open EstherKatz opened 9 years ago

EstherKatz commented 9 years ago

When I try to pull commits in, I get message:

HEAD is now at f81fc80 Merge branch 'master' of https://github.com/JonathanReeve/sanger What am I not getting?

JonathanReeve commented 9 years ago

If you haven't already seen it, pulling in new changes requires a couple of additional commands: https://github.com/JonathanReeve/sanger/issues/75#issuecomment-76070124. What command did you type that gave you this message?

EstherKatz commented 9 years ago

I went through both command sets then entered the password. It worked before ( a days ago). It does not say error, but this is what I get after I enter the password.

JonathanReeve commented 9 years ago

That looks like the output you get from running git reset. Are you seeing this message after you run that command? It just means that it's reset all the changes that the parser has made (just moving files from xml_queue to xml_added, most likely), and that DO's version of the repositority is at the commit number f81fc80. That will allow you to git pull with the next command. It's a normal message.

JonathanReeve commented 9 years ago

I should add that you only need to run these commands after you've run the parser, since it should automatically pull in changes from GitHub otherwise. It's only that the parser is breaking automatic pulls now, so this is a temporary workaround for that.