search

point97 / marine-planner

0 stars 0 forks source link

merge in wcodp branches #9

Open sfletche opened 10 years ago

sfletche commented 10 years ago

I want to say we should be able to merge in the wcodp-md and the wcodp-md-staging branches without causing any trouble...might use caution just in case...

qpfiffer commented 10 years ago

Hmm, I took a whack at this and there are a lot of conflicts. I don't have the context to merge them in (eg., "Why is this commented out? Why was this path for this logging file changed?") and I'm not sure I feel comfortable doing one or the other.

If I were to try again, should I assume that the wcod-mp and wcod-mp-staging branches are correct?

sfletche commented 10 years ago

Hmmm.. I hear you.

In that case, let's hold off on this for now...