Small tips with hg merge

[guibou]

Hello everybody,

I have just noticed that many of you are doing merge when they want to push commit and that someone has already pushed some commits. Actually, it is not needed (if you don't have yet shared the commit you want to push to the main repository).

You can use the rebase extension which comes with mercurial http://mercurial.selenic.com/wiki/RebaseExtension . Only replace you traditional

Code: Select all

hg merge

command by

Code: Select all

hg rebase

. It is exactly the same worflow, but instead of creating the merge commit, it moves your commit on top of the previous ones, which help in keeping a readable history.