Best practices with Oygen "Track Changes" and Git

Oxygen general issues.
misty
Posts: 16
Joined: Tue Feb 03, 2015 3:23 am

Best practices with Oygen "Track Changes" and Git

Post by misty »

We've run into some issues where "Track Changes" seems to change XML files in wide-sweeping ways, such as completely rewrapping the whole file. These types of changes make it difficult to apply this type of commit to multiple Git branches. Is there any way we can limit the 'damage' that turning on Track Changes does on a per-line basis? Any other advice about Oxygen configuration, best practices, or workflows using Track Changes with a line-based VCS like Git?
Radu
Posts: 9044
Joined: Fri Jul 09, 2004 5:18 pm

Re: Best practices with Oygen "Track Changes" and Git

Post by Radu »

Hi,

Not sure how to advice you here. Change tracking is kept by Oxygen as processing instructions, meaning that indeed it affects the lines of content in the XML.
Maybe you could first create a GIT branch on which the review is done, then after all the changes, they would all get accepted on that branch and then commit on the main branch the content without any Oxygen change tracking. So the main GIT branch would never contain Oxygen change tracking instruction.

Regards,
Radu
Radu Coravu
<oXygen/> XML Editor
http://www.oxygenxml.com
Post Reply