semperpeppe

joined 2 years ago
[–] [email protected] 4 points 3 weeks ago

Probably your instance is not federated yet with makertube. Try after a few days, as your search might have triggered a discovery

[–] [email protected] 2 points 4 weeks ago

I totally agree. We have a file for each chapter. We might just keep a trunk based approach mainly, and resort to short lived branches to allow writers to get their contributions reviewed.

Thank you for the advice

[–] [email protected] 1 points 4 weeks ago

We opted for each file as a chapter. We already have the general structure. We are wondering what is the best approach. Maybe we should not have branches at all(?)

[–] [email protected] 1 points 4 weeks ago

To be honest, in the beginning, I started with a branch for my own version of some chapters. We thought it was ok and merged into main. Maybe if we are going to use branches at all, having a branch for each author could make sense. We need to discuss this

[–] [email protected] 2 points 4 weeks ago

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

[–] [email protected] 1 points 4 weeks 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

[–] [email protected] 3 points 1 month ago (1 children)

Thank you for your reply! What are the "objects" possibly determining a branch? Features? Chapters? Writers? Releases?

 

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!

 

This is probably something for spit cooking, but looks like it could have been an amazing torture device lol