Mark Triggs <[EMAIL PROTECTED]> writes: > 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)
Is it a three-way merge, or a "normal" merge ? I think the right approach here is to merge the patches that are already merges of someone else first. In your case, if you had merged from Stefan first, then, updated your missing list, the bad patch would have disapeared, and the correcting patch would still be there. Then, you could have merged it. -- Matthieu
