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!
Unless you need a “stable” version of your in-development work I wouldn’t split parts of it into branches.
Use branches to draft and explore changes, and merge them when they’re accepted into the baseline draft/current state.
Don’t be afraid to merge “better than before but not final or complete or conclusive” work. You’re trying to evolve, not construct final parts to combine. They won’t ever be final.
This is great advice. I don’t believe we need a “stable” version. I mean, at a certain point our work will be ready and that’s it. We are not going to have different releases. We will have other formats (like a shorter version of this report), but in that case those would live as a different repository I guess