Merging the work of two developers

[danybol]

Hello,

I was wondering if anyone had come up with a good process for the following situation:

1. Developer A starts a new branch in the code repo, and creates a new collection
2. Developer B starts a new branch on the same repo, and creates a different collection
3. Developer A merges their branch into main/master
4. Developer B wants to pull A's changes into their branch without losing their work.

I believe at the moment if Developer B used the 'push' command then it would delete their new collection as it would try to make the schema exactly the same as Developer A's.

If anyone has any suggestions for how to get round this it would be very helpful!

[EdouardDem]

Hi @danybol,

To solve this issue, you need to merge the configurations locally using Git.

1. Both developers should pull their configurations locally.
2. Assuming developer A is working on branch A and developer B on branch B, the Directus configuration of developer A will be located in the directus-config folder of branch A (similarly for developer B).
3. Merge the two branches (A and B) into one and resolve any conflicts that may arise.
4. Once the merge is complete, you can push the updated configuration back to the repository. The resulting configuration should include collections from both branches.

Hope this helps!