search

singnet / opencog

A framework for integrated Artificial Intelligence & Artificial General Intelligence (AGI)
http://wiki.opencog.org/w/Development
Other
14 stars 3 forks source link

Merge opencog/opencog to singnet/opencog #67

Closed ngeiswei closed 5 years ago

ngeiswei commented 5 years ago

Could a brave soul resolve these conflicts?

vsbogd commented 5 years ago

BTW, @ngeiswei , I see very old commits on the top of commits chain in this PR.

ngeiswei commented 5 years ago

BTW, @ngeiswei , I see very old commits on the top of commits chain in this PR.

Which ones exactly? I only see the latest commits from https://github.com/opencog/opencog/commits/master

ngeiswei commented 5 years ago

Oh, you're right!

Top was meant as in top of the screen, not top of the chronological history.

Very strange...

vsbogd commented 5 years ago

@ngeiswei , conflicts are resolved, hopefully we can merge it

ngeiswei commented 5 years ago

I'm a bit scared to merge because of these old commits. I intend to look into this after I'm done with current tasks as it is not urgent for me, let me know if it is for you.

vsbogd commented 5 years ago

Well, I would not say it is urgent, but @Necr0X0der asked some functionality which is still in opencog/atomspace. Lets say that if it will be urgent for us I will look at the history issue closer.

Necr0x0Der commented 5 years ago

Well, I would not say it is urgent, but @Necr0x0Der asked some functionality which is still in opencog/atomspace. Lets say that if it will be urgent for us I will look at the history issue closer.

Well, it is not too urgent, but we encountered a bug, which appeared to be fixed in opencog/atomspace, and we have already wasted some time trying to figure this out. I'm not sure that there is nothing else...

vsbogd commented 5 years ago

Old commits appeared here because some files were moved to opencog/opencog from opencog/atomspace including history. For example AttentionBank.h. Old commits from opencog/atomspace appeared in this history chain consequently.

ngeiswei commented 5 years ago

Oh OK, thanks for looking into this @vsbogd. I suppose we can merge then.

ngeiswei commented 5 years ago

So if you guys are confident enough about the triple merge (cogutil + atomspace + opencog), feel free to go ahead.

vsbogd commented 5 years ago

Only doubt I have is failed atomspace BackwardChainerUTest in last PR to the cogutil https://github.com/opencog/cogutil/runs/74471551 I thought it was fixed in atomspace so I ran it again but I see it still fails. Any way I think I can try to merge cogutil and if atomspace will still fail then revert cogutil/master HEAD.