I want to share a model with a colleague. Each of us can modify the model independently in our own working branches, to add new tables we are working on.
We have a common branch where all our changes come together to be released. How would one merge the incoming changes into the common model?
Here is the scenario:
- reverse engineer and existing db into a model and commit the model in git in a branch called develop
- dev1 creates branch develop1, works on the model and adds objects to the model, commits the model to branch develop1
- dev2 creates branch develop2, works on the model and adds objects to the model, commits the model to branch develop2
- Now, dev1 finishes his work and he has to merge his changes into develop. Can git merge be used with the TDM model files? Or, should "Merge Models" be used to merge the model from branch develop1 into the model from branch develop?