What is reason to detect a continued amends within Xowiki template and extjs-ux files.
In Xowiki, I've noticed there's a reference to an automatic generator:
!-- Generated by ::xowiki::ADP_Generator on Mon Sep 04 03:05:07 UTC 2017 --
Thus, how would I stop the mechanism ?
This question even made me wonder about a rhetoric one: Should I stop it?
Evidences happen to appear within my GIT repository.
Best wishes,
Auto-merging packages/xowiki/resources/templates/view-plain.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/view-plain.adp
Auto-merging packages/xowiki/resources/templates/view-links.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/view-links.adp
Auto-merging packages/xowiki/resources/templates/view-default.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/view-default.adp
Auto-merging packages/xowiki/resources/templates/view-book.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/view-book.adp
Auto-merging packages/xowiki/resources/templates/view-book-no-ajax.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/view-book-no-ajax.adp
Auto-merging packages/xowiki/resources/templates/oacs-view3.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/oacs-view3.adp
Auto-merging packages/xowiki/resources/templates/oacs-view2.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/oacs-view2.adp
Auto-merging packages/xowiki/resources/templates/oacs-view.adp
CONFLICT (content): Merge conflict in packages/xowiki/resources/templates/oacs-view.adp
Automatic merge failed; fix conflicts and then commit the result.
