Manphiz <manp...@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.
