Bug#1051247: muse-el: Choose living upstream for muse-el and merge updates

[David Bremner <david@tethera.net>]

Manphiz <manphiz@gmail.com> writes:

>
> Hi sten,
>
> When trying to pick a new upstream to rebase, I found that pulling
> either upstream repo will result in an incompatible git history versus
> the current debian/master branch on salsa.  I wonder how I should handle
> this?  Is it OK to force push to master?  Will it affect existing
> annotated tags?

Please don't force push the public history. There are various ways to
"fake merge" that are preferable.