Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upSabrSwaption doc + reshape2 dependence eiliminated #64
Conversation
# Conflicts: # man/SabrSwaption.Rd
|
Very exciting -- this look very clean (just five files) and precisely how we want to do this. No merge conflicts either. And the
so that will be a non-issue, and the remaining missing documentation should be simple:
Maybe just two additional aliases in the file Very, very nice. Well done, Terry! |
ddd4afc
into
eddelbuettel:master
|
So I merged this. Try to have your local checkout of your fork catch-up. You may need something like add a tracking master (cf https://help.github.com/articles/adding-a-remote)
after which |
|
Thanks. I believe I have in synch and understand....better. Slow learner on this. I see in rstudio I have a "master" and a "eddelbuettel/master" and they are in synch. I write in master, push to my github, and when ready, pull. |
|
RStudio is "just" an editing tool / IDE -- it's git support is very basic. I would recommend getting friendly with a dedicated IDE for git. There are many to choose from. I am partial to Emacs' magit mode; but some of the GUIs can be nice. And command-line is invaluable. I have some useful aliases and bash tricks. Happy to share but your YMMV. |
|
I got the data stuff sorted out. See commit 1106ee3 for details. PR coming in a moment. Make sure you pull that in once it hits master. |
Followed the outline you provided. There is one warning in travis for the data documentation for which rqlib.R is intended to be an rooxygen2 document for the data, but I was unable to get roxygen2 to recognize it.
Overall, no other issues that have been flagged in R CMD check or travis.