Small tips with hg merge

Discussion related to the organization of the source code, repository and code-level/compiler optimization.

Moderators: Dade, coordinators

Small tips with hg merge

Postby guibou » Wed Jun 29, 2011 4:55 pm

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.
guibou
Developer
 
Posts: 274
Joined: Fri Dec 04, 2009 10:14 am

Return to Organization & Optimization

Who is online

Users browsing this forum: No registered users and 1 guest