search

NCEAS / eml

Ecological Metadata Language (EML)
https://eml.ecoinformatics.org/
GNU General Public License v2.0
42 stars 15 forks source link

spell Timothy Whiteaker correctly #324

Closed twhiteaker closed 6 years ago

mbjones commented 6 years ago

Thanks, @twhiteaker . I appreciate that you tried again with a PR, and encourage you to keep them coming. That said, you might notice that there is a conflict on this PR, and so it can not be merged cleanly.

I suspect you are not starting your edits from the most recent commits in the repository. Your change in sha 261e491 appears to be a duplicate of changes we merged earlier, and your spelling correction in sha 275aca2 should have been very simple to create without any conflicts. I think what is happening is that you haven't updated your branch/fork with the changes from the upstream eml repository, and so you're hitting conflicts on your PRs. Getting your working copy updated and clean before you start editing is key to a conflict-free merge. We're happy to walk through this with you. If you have time, I'm sure someone on the #eml slack channel on https://slack.nceas.ucsb.edu would be willing to step through how to make these changes without any conflicts. Or, if you prefer I can make the spelling fix along the way here as well.

twhiteaker commented 6 years ago

Argh, I thought I had merged upstream in https://github.com/NCEAS/eml/pull/324/commits/c22d9345573e8068e707cd03f44e68d75bd50858. Yes, I'd like to go through it with you. I check on Slack later today.