A useful future enhancement would be to adjust patches that insert adjacent areas so that they can pass each other in a pop/pop operation. The most common case of this being appends to end of file. This would be a form of automatic conflict resolution. The pending patch would be automatically corrected to resolve the adjacent insert conflict. You might want a prompt asking if this was ok andt then remember the answer so that question is not asked repeatedly. It's a mechanism to say that multiple insertions at point X in the original file don't matter in their order of insertion. -- Jon Smirl jonsmirl@xxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
