master and FPD branches are starting to drift a bit about pez HOT 8 CLOSED

I can merge either FPD into master or vice versa, and figure out options for conflict resolution ... unless there are any objections. Or maybe there won't be any conflicts?

from pez.

You've done a fantastic job of cleaning up my generally dreadful Roxygen-ing, and much more besides - thank you. From a reasonably quick skim I can't see anything you've done I disagree with. I think merge into master; what we need now is for me to bring those extra metrics Caroline emailed, and I might as well do that on an up-to-date master.

from pez.

Sounds good, thanks @willpearse for your amazingly quick response.

from pez.

The fallout of git merge FPD:

Removing man/traits.dist.numeric.Rd
Auto-merging man/shape.Rd
CONFLICT (content): Merge conflict in man/shape.Rd
Removing man/plot.fpcomSims.Rd
Removing man/numnames.Rd
Removing man/fpcomSims.Rd
Removing man/FPDist.Rd
Auto-merging R/shape.R
CONFLICT (content): Merge conflict in R/shape.R
Automatic merge failed; fix conflicts and then commit the result.

Amazingly, R/dist.matrix.R wasn't flagged.

from pez.

Thank you for doing all this! :D

from pez.

No worries! 8)

PS -- I'm not sure what you mean when you say 'dreadful Roxygen-ing'. Roxygen does my head in too. Part of the problem is keeping straight which version of Roxygen you are on, and which version some SO answer is on! 8) We tried it in lme4, then switched back to the old fashioned way.

from pez.

672c1c5

from pez.

...you've no idea how re-assuring that is to hear. I thought I was going
crazy leafing through SO...

On 08/05/2014 12:08 PM, Steve Walker wrote:

No worries! 8)

PS -- I'm not sure what you mean when you say 'dreadful Roxygen-ing'.
Roxygen does my head in too. Part of the problem is keeping straight
which version of Roxygen you are on, and which version some SO answer
is on! 8) We tried it in |lme4|, then switched back to the old
fashioned way.

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

from pez.