search

ropensci / neotoma

Programmatic R interface to the Neotoma Paleoecological Database.
https://docs.ropensci.org/neotoma
Other
30 stars 16 forks source link

Resolved issue #25, some minor text changes #28

Closed PalEON-Project closed 11 years ago

PalEON-Project commented 11 years ago

Nothing major.

SimonGoring commented 11 years ago

Sorry, that was me, I added a new account and then apparently pushed, but things weren't syncing properly. Still having some learning curve issues.

SimonGoring commented 11 years ago

Um, so did I do that right? It said it couldn't merge automatically, I used the command line commands they suggested, but I still can't seem to merge the pull request.

sckott commented 11 years ago

@SimonGoring want me to try?

SimonGoring commented 11 years ago

Could you, and maybe let me know what I'm doing wrong?!

sckott commented 11 years ago

Done. Hard to know what went wrong for you @SimonGoring . Did you follow the command line directions from within the neotoma folder on your machine? Did you any conflicts in the merge?

SimonGoring commented 11 years ago

It said there were no conflicts and I ran everything as it was printed in the command line instructions. I wonder if it had something to do with having added the PalEON-Project account. It's worked in the past, so maybe just a hiccup.

sckott commented 11 years ago

Perhaps that is it. Only users with admin access can manage pull requests probably - try next one with your simongoring account

gavinsimpson commented 11 years ago

This merge broke a few things and reverted a few changes I'd made, so now some of the documentation is out of sink with code. I'm fixing those and will submit a pull request in next 10 minutes or so.

SimonGoring commented 11 years ago

Weird, I kept trying to sync and it kept telling me that it was up to date. Sorry all.

On Tue, Jul 16, 2013 at 9:41 AM, Gavin Simpson notifications@github.comwrote:

This merge broke a few things and reverted a few changes I'd made, so now some of the documentation is out of sink with code. I'm fixing those and will submit a pull request in next 10 minutes or so.

— Reply to this email directly or view it on GitHubhttps://github.com/ropensci/neotoma/pull/28#issuecomment-21046445 .

gavinsimpson commented 11 years ago

@SimonGoring No worries, nothing major. Did you do this to sync:

git fetch upstream
git merge upstream/master

where upstream is a remote (that you need to configure) for your repo that points to the rOpenSci repo? If you are working in your own repo and have pushed to its master then git will tell you it is up-to-date. I was hit by this last week.

SimonGoring commented 11 years ago

I've been using the GitHub GUI, maybe I should just stick with the command line.

On Tue, Jul 16, 2013 at 10:46 AM, Gavin Simpson notifications@github.comwrote:

@SimonGoring https://github.com/SimonGoring No worries, nothing major. Did you do this to sync:

git fetch upstream git merge upstream/master

where upstream is a remote (that you need to configure) for your repo that points to the rOpenSci repo? If you are working in your own repo and have pushed to its master then git will tell you it is up-to-date. I was hit by this last week.

— Reply to this email directly or view it on GitHubhttps://github.com/ropensci/neotoma/pull/28#issuecomment-21051237 .

karthik commented 11 years ago

I believe Simon is working with his own remote and sends pull requests to the rOpenSci one.

On Tuesday, July 16, 2013 at 9:24 PM, Simon wrote:

I've been using the GitHub GUI, maybe I should just stick with the command
line.

On Tue, Jul 16, 2013 at 10:46 AM, Gavin Simpson <notifications@github.com (mailto:notifications@github.com)>wrote:

@SimonGoring https://github.com/SimonGoring No worries, nothing major.
Did you do this to sync:

git fetch upstream
git merge upstream/master

where upstream is a remote (that you need to configure) for your repo
that points to the rOpenSci repo? If you are working in your own repo and
have pushed to its master then git will tell you it is up-to-date. I was
hit by this last week.

—
Reply to this email directly or view it on GitHubhttps://github.com/ropensci/neotoma/pull/28#issuecomment-21051237
.

— Reply to this email directly or view it on GitHub (https://github.com/ropensci/neotoma/pull/28#issuecomment-21051824).

SimonGoring commented 11 years ago

Okay, so when I used the command line I sync'd okay, but it won't sync using the GUI. Lesson learned.

karthik commented 11 years ago

GUI is great for beginners and generally works best for single author → single remote. This is a more advanced use case they have not planned for and really does require using the CL. If you're ever stuck give us a holler.