Example of merging changes
1) Commit your changes
2) Update your project
3) Check Revisions to see if other changes have been published since your last publish, you should see the revision graph diverge
4) If no divergence, go ahead and publish.
5) If there is a divergence, merged into the most recent revision, then publish