Duany Espindola kirjoitti: > Hi, everybody! > > I have bean looking for a solution for two weeks for my problem and > this forum is my last try. > I had two equal wiki pages: PageA and PageB. So I make changes in > PageA and different changes in PageB. Now I need merge the changes in > PageA in the PageB. > I read a lot things about merge wiki pages in collision case, but I > don't know how to resolve my problem and I will be happy if anyone help me.
There is tool called "diff3" that can help you to merge and make conflicts correctly provided that PageA and PageB do have common preceding version. See for example <http://en.wikipedia.org/wiki/Diff3> -- Jani Tiainen --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Users" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/trac-users?hl=en -~----------~----~----~----~------~----~------~--~---
