We have our existing code repository in GitHub. This code is in folder structure resembling eclipse IDE forlder structure(or probably they call it metadata structure), like src --> classes --> myclass.cls.
We have a sandbox org that is shared for development among 4-5 developers. We want to set up a process of Source control management with this.
Approach 1 Our approach for this is: 1. Create branches in github for each developer and each developer will pull code from his/her respective branch locally in VS code. 2. Each developer will also have org code retrieved in his VS code(that will be synonymous to master code in GIT).
Now the requirement is that once a developer makes a change in one of the files, and saves it, and then deploys it back to org, it should also be tracked by source control in VS code, so that developer knows that he has to check those changes in.
How can this setup be done in VS code without changing the folder structure that is there currently in GITHUB(metadata structure)? I ask this because folder structure of code fetched from VSCode is different. So how can these 2 things be synced and tracked in 1 single project?
Another approach is create 2 folders/projects in VS code, 1 that contains repository branch cloned code and 1 that contains code from org. Now developer will make changes in org code and whenever he is done, at the end of the day, he will compare it with GIT code o his branch and merge the changes in git code and check that code in. This individual branch will then be merged with master branch via a pull request.
Which is better approach of these 2? Which one is a continuous Integration approach?(I think approach 1)