abapGit/src/zcl_abapgit_merge.clas.xml
WolfTreak 0aecdf7255 Possible solution to zabapgit merge functionality to resolve conflicts (#1407)
* Merging per Textfile

* Add files via upload

* Delete WolfTreak_ABAPGIT_Merging

* Refactoring vom Coding, Darstellung verbessert

* Merging page changed and also merging class extended to instance and conflict methods added

* Refactoring for Travis

* Refactoring for Travis

* Escaping of merged content functions now correct
2018-05-27 16:20:43 +02:00

34 lines
936 B
XML

<?xml version="1.0" encoding="utf-8"?>
<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
<asx:values>
<VSEOCLASS>
<CLSNAME>ZCL_ABAPGIT_MERGE</CLSNAME>
<VERSION>1</VERSION>
<LANGU>E</LANGU>
<DESCRIPT>Merge logic</DESCRIPT>
<EXPOSURE>2</EXPOSURE>
<STATE>1</STATE>
<CLSFINAL>X</CLSFINAL>
<CLSCCINCL>X</CLSCCINCL>
<FIXPT>X</FIXPT>
<UNICODE>X</UNICODE>
</VSEOCLASS>
<DESCRIPTIONS>
<SEOCOMPOTX>
<CLSNAME>ZCL_ABAPGIT_MERGE</CLSNAME>
<CMPNAME>CONSTRUCTOR</CMPNAME>
<LANGU>E</LANGU>
<DESCRIPT>CONSTRUCTOR</DESCRIPT>
</SEOCOMPOTX>
<SEOCOMPOTX>
<CLSNAME>ZCL_ABAPGIT_MERGE</CLSNAME>
<CMPNAME>MO_REPO</CMPNAME>
<LANGU>E</LANGU>
<DESCRIPT>Online Repository</DESCRIPT>
</SEOCOMPOTX>
</DESCRIPTIONS>
</asx:values>
</asx:abap>
</abapGit>