What is your git workflow to have multiple developpers working on the same project ?
We're trying to find a correct git workflow to allow multiple developers to work simutaneously on the same project, preferably as smoothly as a regular software project
We tried a somewhat classical:
- project duplication on design node for each developper
- feature-branch creation, the developer points his project to the branch he wants to work on
- Merge Request the feature branch to master (on our internal gitlab) and synchronyze our master project with the master branch
But we have a problem merging the params.json at the top-level directory... Some parameters of the duplicated project erase the ones of the main project (owner, id) and we don't want this. But some other informations seems to be needed for the merge to happen correctly (new datasets for instance).
How to handle this ? Can merging the params.json be safely ignored, beting on the fact that DSS will "reconstruct it" ?
Notice: we didn't take time to fully experiment skipping the params.json merging.