If gdocs to gdocs, then google takes care of it. If desktop to gdocs, we employ a simple conflict resolution where the conflicted copy gets saved locally.