On Mon, 27 Jun 2022 22:19:19 +0300, Damyan Ivanov wrote: > Tried that and it doesn't solve the problem. I think I discovered how > this happened. > When there are local changes that aren't committed, gbp pull (run by > mr up) will fetch, updating .git/FETCH_HEAD, but the merge will fail. > This leaves the repository in an old state, behind salsa. As a side note: How are you running mr? While playing with dpt-salsa and running mr to check affects, I noticed that I always end up in a shell -- because, as I noiticed later -- my shell history leads me to run `mr -i -j8 up', and the -i tells me that there is a problem. (Of course we should improve the "experience" for plain mr without -i, I just wanted to mention this detail.) Cheers, gregor -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `-
Attachment:
signature.asc
Description: Digital Signature