On 06/30/2016 02:17 AM, Linas Vepstas wrote:
It would be easiest, I think, to keep the master version in master, and
pull (cherry-pick) changes from master back into embodiment.  Which is
what Nil is saying, more or less.

Indeed. Although I should stress that after the changes I'm about to do right on the pattern matcher master, cherry picking from the other branch will be a pain. But apparently it's OK since Shujing said that the one on the embodiment branch doesn't have any new features beside embodiment specific things.

Nil


--linas


--
You received this message because you are subscribed to the Google
Groups "opencog" group.
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected]
<mailto:[email protected]>.
To post to this group, send email to [email protected]
<mailto:[email protected]>.
Visit this group at https://groups.google.com/group/opencog.
To view this discussion on the web visit
https://groups.google.com/d/msgid/opencog/CAHrUA37wKEBqzrH5cdJzDXGE5akJ_h_L2_q-NoRsuqC629z9tw%40mail.gmail.com
<https://groups.google.com/d/msgid/opencog/CAHrUA37wKEBqzrH5cdJzDXGE5akJ_h_L2_q-NoRsuqC629z9tw%40mail.gmail.com?utm_medium=email&utm_source=footer>.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups 
"opencog" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/opencog.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/opencog/5774DE81.90008%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to