Talend GIT team collaboration issues

[MattE]

GIT is a fantastic tool for purely textual sources, however, as a team we run into lots of problems with our Talend projects trying to collaborate and merge changes between team members. They often get lost or overwrite each other without any warning and we only find out when previously fixed problems in our data start to appear again. 

We're struggling to understand why this is happening, have other users ran into this problem? 

Scenario

branch origin/development - this has our main Talend project

User A and User B both pull from origin/development

User A makes a critical change to some SQL code, publishes the job and pushes the code to origin/development via Talend.

User B a day later opens the above job , changes the type of a context variable but does not alter the SQL code or there is something different in User B's settings which forces Talend to alter some of it's own files.

User B's codebase is now recognised as the most recent and will overwrite User A's code changes on origin/development without flagging a conflict.

Talend Cloud Data Management Platform

Studio 7.3.1 R2022-06-07

[jeoste]

Hello,

Talend & GIT is not as easy as GIt for python, java, c# or any other source code. 

A common git best practices, is to create a branch from development (example : jira-1), work offline on it, push the modification to create a cloud backup of jira-1. 

Once finished, merge jira-1 into development, and push this branch, now updated with jira-1.

User B can create a branch jira-2 and modify is code AFTER the modification of user 1.

In Talend it's impossible to merge 2 modifications from 2 users inside the same job. So in your scenario, either user A or user B has to finish, push, merge and let the other work on the same job

If a conflict is detected, you can accept user A version or user B version, not being able to merge the modifications from both in the same job

Regards