While attempting to debug a GDB related issue, we wanted to update GDB to a newer version, when we attpempted the update it failed because gdb uses multiple .inc files one of which contains the PV, which the update process did not rename and so it failed an ugly trace back. There was an issue with patch management via git rebase, once we hacked around the .inc issue!
I've sent a patch to fix the issue with versioned inc files. Regarding the rebase, it's expected that sometimes when you upgrade a recipe there will be a confict you need to resolve - devtool upgrade at least leaves you in the middle of the rebase operation so that you're in a good position to do that. However it didn't actually tell you this explicitly in the output so I have sent another patch to ensure that it does.
Fix merged to master: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=ab227452c79eda9a30c1461a2b611b2453e0c650 Tweak for conflict handling also merged: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=93a1c016661567292d52bb8a6d3e77f486f5febd