Possible Duplicate:
Introduction to Mercurial
My most recent change is remote. Did I finally do this right?
$ hg pull
warning: code.google.com certificate with fingerprint d2:33:75:af:62:64:5b:75:dc:3f:bf:22:30:b6:27:13:ff:3f:90:fd not verified (check hostfingerprints or web.cacerts config setting)
pulling from https://niklasro@code.google.com/p/montao/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
ubuntu@ubuntu:/media/Lexar/montao$ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
So I shouldn’t do merge, I should do pull?
Why is there no simple example how 2 developers collaborate?
For example
Time Developer 1 Developer 2
hg clone hg clone
editing
hg commit
hg push
editing
hg pull
hg commit
hg push
An example of workflow between 2 developers like above would make it much easier to understand what’s hg pull, merg, update and not make me confuse pull with merge.
For example how I now know how to not get 2 heads when there is a changeset from another place.
I could need an example how 2 developers collaborate and how I get remote changes.
For great in-depth examples of how to use Mercurial and a few other VCS’s check out Eric Sink’s Version Control by Example or Joel Spolsky’s hginit.com (Does my answer get an automatic downvote for listing Joel second?)