Re: merge conlict?

[Richard Stallman]

    What does this "merge conflict" in the commit message mean?

Whatever it means, it is too general.  This message ought to
say SOMETHING about what part of the code is being changed and what
the change does.

A response said:

    Both commits merge trunk into a branch.

"Merged trunk into a branch" implies that the branch has changed and
the trunk has not.  If so, why do we get a notification about it?  The
notifications are supposed to be for changes in the trunk, not for
changes in branches, right?