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

Contribution guide with git2r #91

Merged
merged 31 commits into from
Dec 18, 2015
Merged

Contribution guide with git2r #91

merged 31 commits into from
Dec 18, 2015

Conversation

zkamvar
Copy link
Contributor

@zkamvar zkamvar commented Dec 18, 2015

I've created an Rmarkdown document to help with contributing via git2r. I'm thinking about rendering into a static markdown document so it doesn't run into problems with proxy errors. I'm attaching the rendered HTML and markdown files from my machine:
CWG2R.zip

We could include this guide as a link in CONTRIBUTING.md

Let me know what you think, @hlapp.


1. **Fork** the [popgenInfo repository](https://github.com/NESCent/popgenInfo)\*
2. **Clone** your fork to your local machine.\*
6. Checkout your master branch, **fetch** the changes from NESCent and **merge**
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentional that 6. follows after 2.? I know that it will be rendered correctly anyway, but it sticks out when looking at the Rmd.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was originally 6, but then I moved it up and didn't bother changing it because I knew MD would take care of it.

@hlapp
Copy link
Member

hlapp commented Dec 18, 2015

Awesome work, Zhian!

@zkamvar
Copy link
Contributor Author

zkamvar commented Dec 18, 2015

I've made the requested changes. Let me know if these work for you.

from your GitHub fork to NESCent. Your pull request begins a process of open
peer review where content, accuracy, and style are considered. If changes are
suggested, you can make them on your fork and they will automatically be updated
in your pull request. When all questions and concerns have been addressed, the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't they will automatically be updated in your pull request better put as your pull request will be automatically updated with them?

@hlapp
Copy link
Member

hlapp commented Dec 18, 2015

One minor remaining comment (see commit comment), otherwise great! 👍

@zkamvar
Copy link
Contributor Author

zkamvar commented Dec 18, 2015

Done.

Sent from my iPhone

On Dec 18, 2015, at 11:48, Hilmar Lapp [email protected] wrote:

One minor remaining comment (see commit comment), otherwise great!


Reply to this email directly or view it on GitHub.

@stewid
Copy link

stewid commented Dec 18, 2015

Great work 👍

It is possible to add the sessionInfo to the commit message with git2r using session = TRUE

library(git2r)
path <- tempfile(pattern="git2r-")
dir.create(path)
repo <- init(path)

## Config user
config(repo, user.name="Alice", user.email="[email protected]")

## Write to a file and commit
writeLines("Hello world.",file.path(path, "example.txt"))
add(repo, "example.txt")
c1 <- commit(repo, "First commit message", session = TRUE)

## View sessionInfo in commit message
summary(c1)

hlapp added a commit that referenced this pull request Dec 18, 2015
Contribution guide with git2r
@hlapp hlapp merged commit 3cb646b into NESCent:master Dec 18, 2015
@zkamvar
Copy link
Contributor Author

zkamvar commented Dec 18, 2015

Great work 👍

It is possible to add the sessionInfo to the commit message with git2r using session = TRUE

Thanks! That's a good tip; I'll include it in an update.

@zkamvar zkamvar mentioned this pull request Dec 18, 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