Re: master updated (18e7bc87521 -> c71a520d1da)

[Stefan Kangas]

Po Lu <luangruo@yahoo.com> writes:

> How can this be avoided?  I merely ran:
>
>   $ git merge --edit --no-ff feature/android
>
> within a checkout of master; the --no-ff was necessary for supplying a
> ChangeLog entry for the merge itself.

That looks like the right way to do it, so this is a false alarm on my
end.  Sorry for the ruckus.

I believe that I got confused for a second there by the large number
of merge commits from master into feature/android. I think in the
future it would be beneficial if feature branch authors could try to
keep the number of merges from master a bit lower.

In admin/notes/repo we have this advice:

    In general, when working on some feature in a separate branch, it is
    preferable not to merge from master until you are done with the
    feature.

Perhaps we could expand it with some advice that would be more
directly applicable to long-living and "large" feature branches (such
as android and nativecomp), where postponing the merge until the end
might be impractical.

> That's totally fine by me, but alas, you have not told me how to perform
> this procedure.

Yup, false alarm.  I apologize again.

(I'm pretty jetlagged and just came home after an 11 hour layover due
to a delayed flight, so I should probably not be at a keyboard right
now...)