Forums

Find answers, ask questions, and connect with our
community all around the world.

Home Forum Omnis General Forum Compare and merging changes in VCS

  • Compare and merging changes in VCS

    Posted by rolanddo on June 12, 2024 at 6:16 am

    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

    Paul Mulroney replied 1 week, 3 days ago 2 Members · 1 Reply
  • 1 Reply
  • Paul Mulroney

    Member
    July 8, 2024 at 9:22 am

    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.

Log in to reply.