SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-02 21:08:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2,690 Commits 5 Branches 39 Tags 53 MiB
6521d09470
Commit Graph

2 Commits

Author SHA1 Message Date
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
Lars Hvam
323881f606
lcl zip (#1206) 
* lcl_zip to global

* lcl_transport to global

* lcl_transport_2_branch to global

* lcl_merge to global

* lcl_migrations to global

* lcl_news to global

* lcl_repo_content_list to global

* move test to global class

* clean up empty includes
 2018-02-15 15:50:51 +01:00