Yoga is the calming of the modifications of the mind. Yoj meaning to bind, yoga is the process of calming the individual mind stuff to return to a state of wholeness within oneself. But then one can take that further and return to a sense of wholeness with divine consciousness.
(And by ‘return’ I mean removing the obstacles that prevent you from realising that you are, have been, and will always be, already whole.)
If divine consciousness is a still body of water, then individual consciousness is a wave that manifests from that body of still water. The modifications of the mind are ripples upon that individual wave. Yoga is the practice of calming the ripples; meditation is the process of the wave returning to the stillness of the water (or at least the understanding of being simultaneously both a wave and the entire body of water).