Merge conflicts

Even though the infinit Extended Source format significantly reduces the likelihood of merge conflicts, it is still possible for conflicts to occur when multiple users are working on the same component at the same time. Merge conflicts are a natural part of the development process, and infinit has robust support for resolving them.





You can use any tool of your choice to resolve merge conflicts, and infinit will capture and save the resolution for each hunk of code. When it encounters the same conflict again in the release chain, it will automatically reapply the resolution. This helps to streamline the process of resolving conflicts and ensures that changes are properly and consistently applied throughout the environment chain.