search

willpearse / MADtraits

Make A Database of trait data
Other
10 stars 39 forks source link

update for citations #55

Closed sylviakinosian closed 7 years ago

willpearse commented 7 years ago

I'm a bit confused; what does this add over what we did a moment ago? Am I missing something?

willpearse commented 7 years ago

...I could be, because I am tired! :D

sylviakinosian commented 7 years ago

i just wanted to pull down the changes you just made to the citations function...

i tried "git pull" in the command line but it's saying everything is up to date, so i figured a manual pull request was needed?

sylviakinosian commented 7 years ago

..or is it something like git pull willpearse/natdb

willpearse commented 7 years ago

Ah - this requests me to pull in your changes. You're asking me to pull, this doesn't pull in anything for you.

Yes - you want to do something like that last one. https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/

sylviakinosian commented 7 years ago

ok thanks