How to handle xml/html in git feature branch workflow?

by

Git allows for custom merge drivers, selected via gitattributes per path (e.g. for all *.xml files).

What you need to find is a XML-aware merge driver, plus possibly also write a simple script to transform between Git conventions and said merge driver conventions. There is for example XML::Merge Perl module. There is XyDiff, but it looks like it lacks three-way merge (and I guess that for XML building 3-way merge from diffs like described in A Formal Investigation of Diff3 paper (PDF) wouldn’t work). You can also read Matching, diffing and merging XML blog post (or article referenced therein).

Another solution would be to unset merge attribute for XML files (they would be treated like binary files wrt. merge conflicts), and use some graphical merge tool to resolve merge conflicts, perhaps via git mergetool.

More Related Contents:

  1. Why are bullets not appearing on posts? [closed]
  2. Can you provide some examples of why it is hard to parse XML and HTML with a regex? [closed]
  3. Testing text() nodes vs string values in XPath
  4. Scraping html tables into R data frames using the XML package
  5. Create HTML Table with SQL FOR XML
  6. How to avoid joining all text from Nodes when scraping
  7. How do I escape ampersands in XML so they are rendered as entities in HTML?
  8. How can I find an element by CSS class with XPath?
  9. html parsing of cricinfo scorecards
  10. XPath to match @class value and element value?
  11. How to use XPath contains() for specific text?
  12. How To Auto-Format / Indent XML/HTML in Notepad++
  13. Converting HTML to XML
  14. Space Before Closing Slash?
  15. White space inside XML/HTML tags
  16. XPath testing that string ends with substring?
  17. How to select first element via XPath?
  18. Coloured Git diff to HTML
  19. Valid content-type for XML, HTML and XHTML documents
  20. Is it possible to have HTML text or CDATA inside an XML attribute?
  21. Is it possible to insert HTML content in XML document?
  22. Is whitespace allowed within XML/HTML tags?
  23. How to see an HTML page on Github as a normal rendered HTML page to see preview in browser, without downloading?
  24. Line Break in XML? [duplicate]
  25. Why is XPath contains(text(),’substring’) not working as expected?
  26. Styling text input caret
  27. Make Iframe to fit 100% of container’s remaining height
  28. How to load image (and other assets) in Angular an project?
  29. Tab character instead of multiple non-breaking spaces (“nbsp”)?
  30. Scale SVG to container without mask/crop

Leave a Comment