Hi there, we are a small tram of social researchers working on writing a collective report together. The report has several chapters. Our plan is to use git to store changes and easily traceback to different versions as well as allowing everyone to experiment with new ideas.
I am trying to decide a branching strategy, and so far I guess something like feature branching could do. We could have a branch for each chapter…? And maybe, when a chapter is kind ready, we could merge into main…?
We will have members working potentially on different parts of the report in different moments.
Advice is needed. Thank you!
I would go with a trunk based approach. In other words no other long lived branches other than main. Push for review often and merge to main as soon as it’s approved.
If you don’t see a need for a more complex branch strategy, you probably don’t need it. Branches are always an increased risk for conflicts and can be a pain to resolve.