Wikimedia Bugzilla is closed!
Wikimedia
migrated from Bugzilla to Phabricator. Bug reports are handled in
Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See
T2980, the
corresponding Phabricator task for complete and up-to-date bug report information.
Back to bug 980
Who |
When |
What |
Removed |
Added |
rowan.collins
|
2004-12-02 16:55:18 UTC
|
Summary
| CVS/SVN like merging for concurrent edits
| edit conflict handling should offer *partial* merges where a full merge is impossible
|
mah
|
2011-04-14 15:11:19 UTC
|
Priority
| Normal
| Low
|
federicoleva
|
2013-03-06 08:44:01 UTC
|
Priority
| Low
| Normal
|
CC
|
| federicoleva
|
Summary
| edit conflict handling should offer *partial* merges where a full merge is impossible
| Automatical merge of conflicting non-section edits to different sections
|
federicoleva
|
2013-03-06 08:44:43 UTC
|
Summary
| Automatical merge of conflicting non-section edits to different sections
| Automatical merge of conflicting non-section edits to unintersecting sets of sections
|
aklapper
|
2013-03-06 09:11:00 UTC
|
Priority
| Normal
| Low
|
federicoleva
|
2013-03-06 10:08:44 UTC
|
CC
|
| stvrtg
|
federicoleva
|
2013-03-06 12:15:00 UTC
|
See Also
|
| https://bugzilla.wikimedia.org/show_bug.cgi?id=4745
|
bawolff+wn
|
2013-03-07 01:20:54 UTC
|
CC
|
| bawolff+wn
|
matma.rex
|
2013-05-22 18:23:56 UTC
|
Blocks
|
| 48719
|
qgil
|
2014-04-25 03:37:49 UTC
|
Priority
| Low
| Lowest
|
CC
|
| jforrester, qgil
|
perhelion1
|
2014-09-08 11:18:40 UTC
|
CC
|
| perhelion1
|
Back to bug 980