Re: [elpa] externals/triples 9673b6de5e: Compilation fixes by Stefan Monnier.

[Stefan Monnier]

Looks like you force-pushed a slightly different version of this patch
to your upstream repository.  So `elpa.git` now can't track your
upstream repository because it's not a "fast forward" any more.

    % make fetch/triples
    emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "triples"
    Fetching updates for triples...
    Upstream of triples has DIVERGED!
    
      Local changes:
    9673b6de5e  ahyatt@gmail.com  Compilation fixes by Stefan Monnier.
    
      Upstream changes:
    bc0fb6fc91  ahyatt@gmail.com  Compilation fixes by Stefan Monnier.
    
    %

Could you resolve this by `git merge 9673b6de5e` into your
upstream branch?

In case you don't have commit 9673b6de5e any more in your local clone,
you can fetch it from `elpa.git` as follows:

    git fetch git://git.sv.gnu.org/emacs/elpa.git externals/triples
    git merge FETCH_HEAD

And please refrain from force pushing to a public branch unless it's
*really* indispensable.


        Stefan