Matthieu MOY <[EMAIL PROTECTED]> writes: > Quoting Mark Triggs <[EMAIL PROTECTED]>: > >> Hey everyone, >> >> Has anyone else ever noticed that some lines have been duplicated after >> merging? > > Yes, it *did* happen, but shouldn't anymore. > > This happens when the same patch is merged several times. For example, Stefan > merged from me yesterday or day before yesterday. If you merged from me first, > Stefan's patch didn't disapear from your missing list, so, you should have > merged from him too, resulting in a double merge of my patch. > > To avoid that, you should use the bookmark missing feature, and merge only > patches with the mention [NOT MERGED]. In the case above, this would have > indicated Stefan's patch.
Yeah, this is what I've been doing. Stefan's patch was marked [NOT MERGED] so this is the one I merged. I had a feeling the merging assistant would stop this sort of problem, so it's good to have that confirmed, thanks. Mark -- Mark Triggs <[EMAIL PROTECTED]>
