Me and my team are facing a huge hassle trying to work with git on creatio, a lot of conflicts and compilation issues due to 2 or more developers pushing changes in the same package, that cost us some work to be redone as we had to reset our git repo to the last commit that didn't have issues.
Is there a way that makes working with git easier? tried to use T.I.D.E. but sadly it's not very clear how it works.
Like
Hello,
As a best practice, we recommend first pulling and downloading any changes made by other users from the global repository. Once those changes have been synchronized, commit your updates to the local repository and then push them to the global repository. This approach helps minimize conflicts and ensures that your work is based on the latest version of the codebase.
We also recommend using a trunk-based development approach to organize the repository structure. Under this model, each repository typically contains: trunk, release and feature branches. When creating a new repository, generate its initial content using the Clio utility. Development work should be performed in a dedicated feature branch. Once the functionality has been completed, tested, and validated, the changes can be merged into the trunk branch for further integration and delivery.