Tutorials

Alternatively, base could be updated iff ours==theirs

(that would resemble how merging in VCS work)