function readOnly(count){ }
Starting November 20, the site will be set to read-only. On December 4, 2023,
forum discussions will move to the Trailblazer Community.
+ Start a Discussion
dnash Bdnash B 

git strategy for different teams working on single code

hi team, 

My team planning to move org base development model. Hence, source code repository (bitbucket) is mandatory and first step of change we should implement. Problem here is, We have multiple team (team X, Y, Z etc) and everyone working in same source code and at the end of the day everyone check conficts in salesforce using report and go to release. 

In new case, we are planning to bring up differnet git repo for each team and the mess between differnet team can be avoided, but the real problem arise, when we merge code into "repo R". because, developer from team "X" and "Y" might have played with same code in repo "X" and "Y" and at the very end when i take that code into masters of repo "R", RM team might face conflicts due to same line change. 

on other hand, keeping everyone in single repo is solution, because thats how public repository model is working. but looking up differnet way to solve this conflict

My expectations:
When developer changing anything in repo "X", then repo "Y" should see that conflict and vice versa

Any assistance on this highly apprciable
VinayVinay (Salesforce Developers) 

Hi,

Found below links which can give additional details and considering bitbucket should be a good option.  However, if X wants to move changes then Y should always retrieve the latest repository code so that there is no changes overridden.

References:
https://medium.com/dev-genius/choosing-the-right-git-branching-strategy-for-your-team-2a53144fcbdb
https://blog.logrocket.com/the-git-workflow-you-need-how-to-deal-with-multiple-teams-in-a-single-repository-faf5bb17a6e4/

Thanks,