kbase / project_guides

This repo contains documents and guides that describe project principles, how-to docs, etc.

MIT License

7 stars 33 forks source link

update from AA email #50

Closed dangunter closed 9 years ago

dangunter commented 9 years ago

This doc. seems out of date. If this is not even the most current copy of the doc (?!) then we should delete it.

nlharris commented 9 years ago

Why do you think there might be a more current version of this doc?

Once we've resolved that, I would like to add text about the PR-approval process. (It's alluded to in the added text but not actually explained.)

dangunter commented 9 years ago

I am just a suspicious person. Yes, please feel free to edit @fperez would no doubt be glad to get the help.

nlharris commented 9 years ago

Ok, should we merge your PR first and then I'll edit from there?

fperez commented 9 years ago

Note that this PR seems to have been made from an out-of-date repo, it doesn't merge without conflicts... Needs a fix/rebase before it can be merged. Let me know if you need a hand with that.

nlharris commented 9 years ago

Dan, I'm not sure what's going on here, I'm hoping you can detangle this mess.

fperez commented 9 years ago

It's a merge conflict, it needs a rebase.

dangunter commented 9 years ago

Would be easier to drop it and try again from the email, I think it's only 5-10 lines of new text.

1f4kXVW

http://xkcd.com/1525/#eyJxIjoid2lsbCBpIGZpbmQgaGFwcGluZXNzIiwiYSI6WyImI3gxRjZBRTsiXX0=)

On Thu, Jul 30, 2015 at 9:34 PM, Fernando Perez notifications@github.com wrote:

It's a merge conflict, it needs a rebase.

— Reply to this email directly or view it on GitHub https://github.com/kbase/project_guides/pull/50#issuecomment-126563775.

fperez commented 9 years ago

Closing here in favor of #51, please let me know if that does the job and we can merge that instead then.