tortoisehg - How to develop features with Mercurial correctly? -

tortoisehg - How to develop features with Mercurial correctly? -

we 2 developers , want utilize mercurial in our little project. both in touch mercurial first time. openend bitbucket business relationship our repository. generated test project skeleton , pushed on repository. workmate clone repository , commited testing. want force on repository server.we got that:

i cant merge 2 branches, becouse there no head revision. can update master branch , got that:

is there way merge 2 branches? best practise manage somethink (eg. develop feature)? maybe workmate need clone , open new named branch?

bottom line mercurial - merge locally. in repository , force parent repository.

your bitbucket repository container. maintain master repository , work locally.

also, @boas suggested, @ dvcs u , hginit. both great starters (and advanced users) , sort dvcs.

mercurial tortoisehg