Git

3200 readers

3 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

Follow programming.dev rules
Be excellent to each other, no hostility towards users for any reason
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 2 years ago

MODERATORS

Ategon

canpolat

jnovinger

Branching strategy for a text based project (feddit.it)

submitted 3 weeks ago by semperpeppe@feddit.it to c/git

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

[–] BehindTheBarrier 1 points 3 weeks ago

Not sure if this advice really applies, given i haven't used Git for any reports myself and I don't know how you are doing the text based project. I did pretty much all my uni reports in a online latex document site which allowed shared editing, so there was some history but all edits were live to the main doc.

But with the power of latex at least, you can have the main file do import and usages, and maybe some setup. And then combine other files representing anything you want. Such as one for front page, one per chapter or one for appendixes.

Then just can do changes/new sections in feature style branches, and it's up to you if you want things to go to the main branch, or have a dev like branch where further refinement can happen if your work is structured and not all over the place like my report writing was.