Any Change Creates New Heads?

[Douglas Philips]

On or about 2009 Apr 28, at 5:23 PM, Marijn Vriens indited:
> The normal way is that if you develop something and the "push"  
> command complains that it will create new heads (because someone  
> else already commited) you just "pull" those changes to your local  
> repo (local head count will go up). now locally merge your changes  
> with the changes you just pulled (head count will go down). If you  
> now push, it will send your changes without adding more heads to the  
> remote server.

There is a bit of a wrinkle there. If you just pull/merge/commit  
(fetch does this for you), then you are responsible for the results of  
the merge. It is a matter of your workflow/policy as to how much you  
should/need to examine/test the results. This is another one of the  
EVIL things that CVS would hide from you, and so it can be a bit of an  
adjustment. It can also seem like a bit of a burden. The burden was  
there all along, its just that now you are more aware of it. :)

> Merging is the normalest thing in the world in a DVCS. It's nothing  
> to be afraid of and trivial in 95% of the cases.

Yes, getting used to merging can take some time, esp. if one has been  
conditioned by other tools (CVS) to think it is hard/painful. :)

--Doug