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

[Alex]

Hi,

Right, I meant the unnecessary merge caused by plainly pulling one
branch onto another when the latter has local changes. Of course, if
there are conflicts you'd still have to resolve them, but in general,
it causes less noise when this is not the case.

Regards
Alex

On Fri, Sep 2, 2011 at 10:44 PM, Jonathan M Davis <jmdavisProg at gmx.com> wrote:
> 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
> _______________________________________________
> D-runtime mailing list
> D-runtime at puremagic.com
> http://lists.puremagic.com/mailman/listinfo/d-runtime
>