Best way for sync?

It would be nice if we could do this (semi- for merge conflicts) automatically.