#152: Locking pages while editing to prevent conflicts
--------------------+-------------------------------------------------------
 Reporter:  daniel  |        Owner:  jonas
     Type:  defect  |       Status:  new  
 Priority:  low     |    Milestone:  1.0  
Component:  wiki    |      Version:  0.5.2
 Severity:  normal  |   Resolution:       
 Keywords:          |  
--------------------+-------------------------------------------------------
Comment (by [EMAIL PROTECTED]):

 Has this reached any sort of resolution? We're seeing more and more
 conflicts with a larger development team and would love a simple merging
 interface for wiki conflicts. It doesn't have to do anything fancy -- just
 a simple side-by-side diff with radio buttons to select the appropriate
 side for each difference would work fine.

 Is there a separate ticket for the wiki merging feature? If not, I propose
 a rename of this ticket to reflect the "merging" angle if this is indeed
 the approach that Edgewall wishes to take.

-- 
Ticket URL: <http://trac.edgewall.org/ticket/152#comment:8>
The Trac Project <http://trac.edgewall.com/>
_______________________________________________
Trac-Tickets mailing list
[email protected]
http://lists.edgewall.com/mailman/listinfo/trac-tickets

Reply via email to