Unfortunately I used merge as I was unfamiliar with rebase and was in a bit of hurry. (Lame excuse, I know. I'll make it a point to study rebase in detail)

Just to confirm, are you saying that using rebase at all times to keep B aligned with A would have kept me from getting into this messy situation? (at least in this particular case where I was developing B on top of A)

If so, and if my feature request is now effectively useless I apologize for wasting your time (I didn't mean to) and I thank you for your tip.