[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 Quim Gil q...@wikimedia.org changed: What|Removed |Added Priority|Low |Lowest CC||jforres...@wikimedia.org, ||q...@wikimedia.org --- Comment #6 from Quim Gil q...@wikimedia.org --- Marking as Lowest since nobody is planning to work on this currently. CCing James just in case he wants to add a VisualEditor perspective. -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 Bartosz Dziewoński matma@gmail.com changed: What|Removed |Added Blocks||48719 -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 Nemo federicol...@tiscali.it changed: What|Removed |Added Summary|Automatical merge of|Automatical merge of |conflicting non-section |conflicting non-section |edits to different sections |edits to unintersecting ||sets of sections -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 Andre Klapper aklap...@wikimedia.org changed: What|Removed |Added Priority|Normal |Low -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 Nemo federicol...@tiscali.it changed: What|Removed |Added CC||stv...@gmail.com --- Comment #3 from Nemo federicol...@tiscali.it --- *** Bug 23736 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 Nemo federicol...@tiscali.it changed: What|Removed |Added See Also||https://bugzilla.wikimedia. ||org/show_bug.cgi?id=4745 -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 Bawolff (Brian Wolff) bawolff...@gmail.com changed: What|Removed |Added CC||bawolff...@gmail.com --- Comment #4 from Bawolff (Brian Wolff) bawolff...@gmail.com --- Note normal conflict edit resolution doesnt care about sections... (it feeds the entire thing to gnu diff3) It sounds like what is being asked for is a nicer edit conflict screen. The current version certainly could use work. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 980] Automatical merge of conflicting non-section edits to unintersecting sets of sections
https://bugzilla.wikimedia.org/show_bug.cgi?id=980 --- Comment #5 from Nemo federicol...@tiscali.it --- (In reply to comment #4) It sounds like what is being asked for is a nicer edit conflict screen. The current version certainly could use work. Yes, that might the actual solution for the problem. Most important thing would probably be showing the user what their changes were and providing them in a way easier to paste/manually merge: (Quoting from 23736 comment #2) (In reply to comment #1) (Continuing) Simply refactoring how the change conflict page is displayed could mitigate some of these issues. For example, showing the user's own diff at top would allow them to see first what exactly has occurred, and allow them to re-select the text to paste back into the new edit field. A particulary effective solution could be in printing re-opened section-edit fields rather than the whole page edit fields. Hm, this appears like bug 17177, but is actually different; in a way, it's like bug 980 again, in that we'd like to have a report on merge conflicts like SVN/CVS/Git produce. The idea was rejected by the proposer there because it would make the edit window too complex, but maybe there's an easy solution we could still profit from, like a way to show what your diff to the revision you were editing was, or anyway to provide the user something better to copy and paste in the edit area to recover the own edit. In the past I you also had the option to merge the others' edits into yours and then copy the result to the edit area, but now the textarea at bottom is read-only. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
