Merging has poorly chosen default behavior
|Reported by:||Owned by:|
|Cc:||Ryan J Ollos||Trac Release:||0.11|
Assume there is a trac page with sections A and B. User one begins to edit section A. While this occurs, user two edits section B and saves changes. When user one goes to save changes to section A, user one's merge prompt will remove user two's changes *by default*.
I think the default behavior on wikimedia is ideal - namely that edits in different sections are seamlessly committed. Even if this behavior is not possible, the organization of different sections implies that the edits are over different areas, so taking both user's edits by default would seem more sensible.
(I'm on trac release 0.11.3 on ubuntu 8.04, setup was using easy_install for Trac)