Sync Early, Sync Often

This is a good motto for distributed development. The more often you pull and update your repository, the less often you'll encounter really difficult merges.

It's also better for you to do merges on your side than to leave them for other people, as you're probably in a better position to fix things.