-
Compare and merging changes in VCS
Hi Omnis community,
I’m currently using Omnis VCS (Version Control System) to manage my library classes. When merging changes between branches or versions, I find myself manually comparing classes and resolving differences (for the prod and stage version as well). This process is time-consuming, especially when dealing with a large number of classes during an upgrade from desktop to web.
My question is: Does Omnis VCS have an automated merge function? Ideally, I’d like a feature that can auto-merge changes and only require manual intervention for conflicts.
Any insights or tips would be greatly appreciated!
Thanks,
Roland Do -
2 Replies
-
Hi Roland,
The short answer is no – the VCS can’t handle branches and merges, because of the binary nature of the system. There are moves to use git, but this requires a radical change to the way that libraries work.
What you can do is to export the library in JSON, then use a text comparison tool to compare the branches and merge. Then re-import the merged result. You might find that a little quicker.
Regards,
Paul.
-
Some Omnis developers have chosen to export the source code to a text file and use Git or other comparison tools (like raft wars) to merge changes before importing back into Omnis.
Log in to reply.
