I'm not sure if this is already stated, but we should emphasize that you should do a fetch right before merging a changeset. If one of the branches is out of date, you can try pushing both branches at once, and one will succeed but of one is behind master then this will fail and the push won't be 'atomic'.