From: Jon Smirl Date: Mon, 24 Nov 2008 14:11:51 GMT Subject: Re: Stgit and refresh-temp Message-ID: <9e4733910811240611x605b539am6a659ab29437035@mail.gmail.com> In-Reply-To: <20081124111635.GA31986@diana.vm.bytemark.co.uk> 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@gmail.com