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
> --
> 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
opencog+u...@googlegroups.com.
> To post to this group, send email to
ope...@googlegroups.com.
> To view this discussion on the web visit
https://groups.google.com/d/msgid/opencog/a9b5276b-f191-4df5-a9c9-8051170f76d8%40googlegroups.com.