[Mark Triggs] > Matthieu Moy <[EMAIL PROTECTED]> writes: >> However, I've reverted this in a further patch, so, you probably >> didn't merge all. > > Ah, interesting. I definitely merged all of your patches. I've just > repeated my steps: > > * merged all of your patches in, verified that xtla.el was correct. > * merged with Stefan (who has your patches 199-209). > > Because Stefan has merged your patch that broke missing but not the one > that fixes it, my local tree got re-broken. Has this ever happened to > anyone else? Anyone have any standard tricks for avoiding it? :o)
Not really a "trick", but: Don't trust star-merge to automatically "do the right thing" if the merge flow isn't properly star-shaped. comes to mind. -- Harald
