18
Branching strategy for a text based project (feddit.it)
submitted 1 year ago by semperpeppe@feddit.it to c/git@programming.dev
15 comments fedilink hide all child comments

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!

you are viewing a single comment's thread
view the rest of the comments
[-] mundane@feddit.nu 2 points 1 year ago

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.

[-] semperpeppe@feddit.it 1 points 1 year ago

Yeah, I agree. I mean, we have different files for different chapters. So I guess a trunk based approach would work. Benefits from using a branch for each chapter variations might be needed, but only in specific cases. And to be honest, I think this does not really applies to us

this post was submitted on 14 Mar 2025
18 points (100.0% liked)

Git

4740 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 3 years ago
MODERATORS
Ategon@programming.dev
jnovinger@programming.dev
canpolat@programming.dev