Tools for Magic xpa, uniPaaS and Magic eDeveloper          
Tools for Magic XPA, uniPaaS and Magic eDeveloper
Our Resellers:
Japan Indonesia




 

 

Merge

for Magic xpa



merge branches & resolve conflicts with GUI and without looking at complex source XML

Download Free Trial Request demo Manual




Merge branches

Merge project branches that were maintained in parallel, either development and release version or 2 development versions to prepare for production release.



Download Free Trial Request demo







Resolve conflicts

In some situations, merging will identify changes were done to the same line or operation. To correctly resolve these conflicts, we need more than just correct information, we need all the details, properties of the conflicted line or operation. Merge shows conflicted lines as they appear in Magic xpa studio. We don't need to resolve source XML.

Download Free Trial Request demo






Various Merge views





Download Free Trial Request demo




Merge repositories

Merge and resolve conflicts in all repositores.




Download Free Trial Request demo




Merge programs

Merge and rresolve confilcs in individual tasks and every section of the task. The views have been prepared to look as close to Magic studio as possibel so developers can quickly resolve conflicts.






Download Free Trial Request demo




Integrate with Source Control Management systems

Team Foundation Server, Git, Subversion, CSV, SourceGear Vault, Perforce, Source Anywhere, CVS, HG, Visual SourceSafe, Mercurial, Jalindi Igloo, and many more.





Download Free Trial Request demo


 
Privacy statement | Terms of Use | Delivery policy | Refund policy | About us | Contact us  
 
Copyright © 2005 - 2017 Ocean Software Solutions
 



1