Re: Emacs-diffs Digest, Vol 53, Issue 105

[Richard Stallman]

    Better not: since the script copies changes from the branch to the trunk,
    it's better to install changes only on one or the other, but not on both,
    otherwise you'll end up with spurious conflicts and/or duplicated changes.

That would be one way of doing it -- but then what use is it to have
the separate branch?  And what about cases where we want to make
different changes in the branch and the trunk (such as timeclock.el)?