search

cbreto / panelPomp

R package for statistical inference using panelPOMPs (panel Partially Observed Markov Processes)
11 stars 6 forks source link

Interface #23

Closed kingaa closed 6 years ago

kingaa commented 6 years ago

This is the set of changes we worked on this afternoon.

cbreto commented 6 years ago

Thanks Aaron!

cbreto commented 6 years ago

Hi Aaron-- This branch cannot be rebased due to conflicts Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch.

kingaa commented 6 years ago

But you can merge it, no? Or just cherry pick... A.

cbreto commented 6 years ago

Yes— I’ll pull from kingaa/panelPomp/interface, locally cherrypick onto cbreto/panelPomp/interface and push but I don’t think there’s anything I can do through github’s web. The only option (“rebase and merge”) is grayed out.

On Aug 10, 2018, at 2:34 PM, Aaron A King notifications@github.com wrote:

But you can merge it, no? Or just cherry pick... A.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread.

kingaa commented 6 years ago

Just withdrew that pull request and made another, that should merge automatically.

A.

On Fri, Aug 10, 2018 at 2:42 PM Carles Breto notifications@github.com wrote:

Yes— I’ll pull from kingaa/panelPomp/interface, locally cherrypick onto cbreto/panelPomp/interface and push but I don’t think there’s anything I can do through github’s web. The only option (“rebase and merge”) is grayed out.

On Aug 10, 2018, at 2:34 PM, Aaron A King notifications@github.com wrote:

But you can merge it, no? Or just cherry pick... A.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/cbreto/panelPomp/pull/23#issuecomment-412171013, or mute the thread https://github.com/notifications/unsubscribe-auth/ABxuizA9y8ldCdO_-Hb0Mbo2G01QG75Pks5uPdQbgaJpZM4V4hhM .

-- Professor Aaron A. King Ecology & Evolutionary Biology Mathematics Center for the Study of Complex Systems Center for Computational Medicine & Bioinformatics University of Michigan kinglab.eeb.lsa.umich.edu GPG Public Key: 0x15780975