On 17/03/2008, Martijn Hoekstra martijnhoekstra@gmail.com wrote:
Because that I know of there is no current way to determine if an edit conflict is in different sections, and can be auto-merged. I would like to see an automerge feature sometime in the future, where a proposed merge is displayed. It would solve a lot of problems, even for a very conservative algorithm that only suggests a merge when the edits are done to different sections. It still would only have to load the specific section again to make the changes. I don't know how hard this would be though, but it doesn't sound too hard to me.
Conflicts are already merged automatically where possible - a more advanced system of working out how to merge (possibly involving asking the user to check it) would be great, but the very conservative algorithm you suggest does already exist.