Xiyue Deng <manphiz@gmail.com> writes: > Package: elpa-muse > Severity: minor > X-Debbugs-Cc: none, Xiyue Deng <manphiz@gmail.com> > > Currently muse-el has two main upstream repositories: one from Elpa > external branch[1], one from github[2], and the two has diverged > somehow. We should decide on which repo to track in d/watch. > > [1] http://git.savannah.gnu.org/cgit/emacs/elpa.git/log/?h=externals/muse > [2] https://github.com/alexott/muse > > -- System Information: > Debian Release: 12.1 > APT prefers stable-updates > APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 'stable') > Architecture: amd64 (x86_64) > > Kernel: Linux 6.1.0-11-amd64 (SMP w/16 CPU threads; PREEMPT) > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set > Shell: /bin/sh linked to /usr/bin/dash > Init: systemd (via /run/systemd/system) > LSM: AppArmor: enabled > 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? -- Manphiz
Attachment:
signature.asc
Description: PGP signature