You shouldn't need to be "merging changes" -- you should just be doing pulls to master. If git is asking you to merge, that means that you must have accidentally checked something into your master branch. Don't do that! Leave the master alone, so that it can always cleanly and trivially track upstream, and do all of your development in a private branch, which will thus be stable, and not subject to disruption from upstream changes.
--linas On Sat, Dec 29, 2018 at 7:25 AM Johannes Castner <[email protected]> wrote: > > Interesting ...so if I merge the changes on one of those repos, I better > merge them for all of them at the same time? > > > Johannes > > On Thursday, December 20, 2018 at 7:42:32 PM UTC, Nil wrote: >> >> On 12/20/18 9:33 PM, Johannes Castner wrote: >> > That’s actually a great question! ...I at some point tried running things >> > before I realized that I didn’t install yet—now I have it all working >> > again. One thing that I’m having a hard time explaining is that when I >> > first forked opencog/opencog for some reason it forked a repo that wasn’t >> > up to date... some issue with git? I figured that out after much >> > wrestling with things, I sent myself a pull request and merged and then it >> > worked. Did that ever happen before to someone else? >> >> The only thing I can think of is that while you forked, changes have >> been introduced that made your cogutil, atomspace and opencog repos out >> of sync. That sort of changes are occasional but they tend of come in >> waves and it looks like you've been caught right in the middle of it. >> >> Nil > > -- > 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/a9b5276b-f191-4df5-a9c9-8051170f76d8%40googlegroups.com. > For more options, visit https://groups.google.com/d/optout. -- cassette tapes - analog TV - film cameras - you -- 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/CAHrUA34PxCCtYqzEi8hnBhHgzFNsc3%2BZH5kgey2fggk276gikA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
