[D-runtime] [D-Programming-Language/druntime] 08687b: Merge branch 'master' of github.com:D-Programming-...

[Jonathan M Davis]

On Friday, September 02, 2011 12:01 Alex wrote:
> Hi,
> 
> Rule of thumb: *Always* git pull --rebase origin master when you want
> to pull. That makes sure to rebase your changes on top of the incoming
> ones, thus avoiding a merge.

It doesn't avoid a merge. It just rearranges the history. You still have to 
worry about merge conflicts and whatnot. And sometimes you _want_ the history 
from the branch being merged in.

- Jonathan M Davis