News for hackers. Stuff that matters.
Re:Mercurial: Onward and upward by Skinney on Sunday May 03, 2015 @12:39AM (#9479949)
A merge will provide you with a single commit-message, rebasing will provide you a commit-message for every commit, making it easier to remember what the intent of a change was. Sometimes that isn't clear.

Regarding the "rebase, commits will jump between features" part: that really depends on how you do things. On my projects, we use git flow. In such a scheme, every branch you would rebase, belongs to the same feature or bugfix.

Re:Mercurial: Onward and upward by imakesnowflakes on Sunday May 03, 2015 @12:57AM (#9480003)
>In such a scheme, every branch you would rebase, belongs to the same feature or bugfix..

Not sure if I made that clear. But I was talking about the result of the rebase. Once you rebase, all the commits that were in different branch ends up being back to back, and hence become interleaved...