search

claudiatebaldi / hectorcal

3 stars 3 forks source link

Krd single esm calibration #8

Closed kdorheim closed 5 years ago

kdorheim commented 5 years ago

@rplzzz I would like to get this branch merged in... it has turned into a bit of a beast :(. I cannot get the package check to pass, it looks like there is some issue with the make_loglikelihood tests. They pass the devtools::test but fail with devtools::check. Are you seeing the same behavior on your local machine?

rplzzz commented 5 years ago

I think something went awry with one of the merges. Among other things it appears that the parameterize_core function appears in both singleESMcalibration.R and util.R. (I'm surprised that doesn't cause an error of some sort.)

What tools, if any, do you use for resolving merge conflicts? At minimum, I recommend setting as a global option merge.conflictstyle=diff3. It's a lot easier to figure out the intent of a pair of diverging changes if you can see how each one changed the original, rather than just seeing how they differ from each other.

kdorheim commented 5 years ago

I guess I just use what ever R's default it, but I will set merge.conflictstyle=diff3