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

Extend curve building to 100 years #48

Merged
merged 4 commits into from May 16, 2016
Merged

Conversation

@tleitch
Copy link
Contributor

@tleitch tleitch commented May 16, 2016

Fork of master, modified, tested with R CMD check and travis

@@ -1,5 +1,11 @@
2016-05-12 Dirk Eddelbuettel <edd@debian.org>

This comment has been minimized.

@eddelbuettel

eddelbuettel May 16, 2016
Owner

You want today's date and your name here, I suppose.

@eddelbuettel
Copy link
Owner

@eddelbuettel eddelbuettel commented May 16, 2016

Looks good -- three commits, four files, clean diff that can be merged. One minor nag noted, you should be able to alter and push to this branch extending the PR to four commits.

We may be getting the hang of it :)

@tleitch
Copy link
Contributor Author

@tleitch tleitch commented May 16, 2016

Thanks.Note: two commits were artificially generated to trigger travis build for the first time. Are you suggesting there should be 1 commit per file?

@eddelbuettel
Copy link
Owner

@eddelbuettel eddelbuettel commented May 16, 2016

No, I was just counting. Yes, each commit (and push) triggers a build (unless you add [ci skip] to the subject).

Tastes vary on whether many commits, or aggregated commits into one (ie "squashed") are better. Larger projects require squashed. A "handful" just like here is fine by me.

@eddelbuettel eddelbuettel merged commit 902a807 into eddelbuettel:master May 16, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@eddelbuettel
Copy link
Owner

@eddelbuettel eddelbuettel commented May 16, 2016

It's merged. If you declare my repo as an additional remote (the term 'parentrepo' is often used) then git pull --all will get updates from both, and can merge my changes (ie from your PR plus my merge commit) and push that back to your fork so that both are in sync.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.