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!

  • heavydust@sh.itjust.works
    link
    fedilink
    arrow-up
    1
    ·
    edit-2
    2 days ago

    If you have long-lived branches, I would do as you say: treat each branch like its own release, then merge once it’s ready. Make sure that everyone knows that those branches exist and that they must not create new ones. You could create all the branches at once with specific names so that no one is confused (like 01-chapter_something, 02-...)