Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MIOCS.md #2

Merged
merged 2 commits into from
Jun 4, 2015
Merged

Update MIOCS.md #2

merged 2 commits into from
Jun 4, 2015

Conversation

megansquire
Copy link
Contributor

a-4 and a-6 are copies of each other; clarified ds-4?

a-4 and a-6 are copies of each other; clarified ds-4?
@libbyh
Copy link
Collaborator

libbyh commented Jun 2, 2015

Thanks, @megansquire! Good catch on the numbering errors. For Version, I think we meant "version of the dataset" though. Noticed another pair of numbering errors when checking that - the optional DS descriptors are numbered wrong. This is my first time managing a repo, so I'm not sure if I'm supposed to just (a) close the pull request without merging, (b) leave it open and ask you to fix it, or (c) merge it and make the fixes myself. Is there a normal practice here? Hopefully you or @derekgr can help me out there.

@megansquire
Copy link
Contributor Author

I am just getting used to pull requests too. I edited my initial commit, so
maybe it shows up as "version of data set" now. Alternatively, we can just
delete my pull request and I can make a new one. I'm still learning github
myself :)

-m

On Tue, Jun 2, 2015 at 4:17 PM, Libby Hemphill notifications@github.com
wrote:

Thanks, @megansquire https://github.com/megansquire! Good catch on the
numbering errors. For Version, I think we meant "version of the dataset"
though. Noticed another pair of numbering errors when checking that - the
optional DS descriptors are numbered wrong. This is my first time managing
a repo, so I'm not sure if I'm supposed to just (a) close the pull request
without merging, (b) leave it open and ask you to fix it, or (c) merge it
and make the fixes myself. Is there a normal practice here? Hopefully you
or @derekgr https://github.com/derekgr can help me out there.


Reply to this email directly or view it on GitHub
#2 (comment).

@derekgr
Copy link

derekgr commented Jun 3, 2015

@megansquire can make the suggested edits in her branch, the one associated with this pull request, and then push up that branch. The changes will be reflected here and @libbyh or whomever can review and then either give feedback for @megansquire to incorporate, or accept the pull request. It looks like @megansquire has already made the edit and pushed again, so we're at the place where @libbyh can either accept (and merge this pull request) or give feedback about further edits she wants before merging.

In this case, @megansquire has to make the edits, because she forked the repository to megansquire/miocs, and probably @libbyh hasn't been added as a collaborator there, so @libbyh can't push changes to the fork.

An alternative, if @megansquire is a collaborator on this repository, would be for her to create a branch in this repository with her changes, push that, and then make a pull request. Because @libbyh is the owner she could have then made commits on the branch without waiting for @megansquire to make the edits directly.

Sorry for so many words. Let me know if that didn't make sense!

@derekgr
Copy link

derekgr commented Jun 3, 2015

It looks like @megansquire already did the former path (made the edits in her fork, and pushed them up). In this pull request, if you click on the "Files changed" tab, you can see that the text now says "Version of this data set".

@derekgr
Copy link

derekgr commented Jun 3, 2015

Some other tips, if you haven't had enough words from me:

  • In the "files changed" tab, you can click on a particular line and leave a comment specifically on that line; look for a plus sign in a green box when you hover over a particular line. For example, @libbyh could have commented directly on the "Version" line suggesting the change.
  • Also in the "files changed" tab, you can click the "View" button on files like markdown files to see what the rendered markdown will look like.

update_miocs_md_by_megansquire_ _pull_request__2_ _libbyh_miocs

@libbyh
Copy link
Collaborator

libbyh commented Jun 4, 2015

Thank you, @derekgr and @megansquire !

libbyh added a commit that referenced this pull request Jun 4, 2015
@libbyh libbyh merged commit 66dd7a4 into OCDX:master Jun 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants