Communicating the situation in the client would indeed save some chunk of time. I ran into this for an nmap sru recently, and while I indeed did the steps described in the last paragraph of comment #4, I hadn't run into this corner case before, and it definitely took some head scratching time to figure out.
Also, it didn't occur to me the MP would also need targeted to jammy rather than jammy-devel as usual, so the diff ended up showing a ghost conflict:
It would be ideal if we could rely on *-devel always pointing to the correct tip, but if we can't then having a (mechanical) way to detect when it doesn't would be the next best thing.
Communicating the situation in the client would indeed save some chunk of time. I ran into this for an nmap sru recently, and while I indeed did the steps described in the last paragraph of comment #4, I hadn't run into this corner case before, and it definitely took some head scratching time to figure out.
Also, it didn't occur to me the MP would also need targeted to jammy rather than jammy-devel as usual, so the diff ended up showing a ghost conflict:
https:/ /code.launchpad .net/~bryce/ ubuntu/ +source/ nmap/+git/ nmap/+merge/ 437077
It would be ideal if we could rely on *-devel always pointing to the correct tip, but if we can't then having a (mechanical) way to detect when it doesn't would be the next best thing.