coderefinery / git-collaborative

Collaborative distributed version control lesson.
https://coderefinery.github.io/git-collaborative/
Creative Commons Attribution 4.0 International
9 stars 41 forks source link

Switch to "main" as default branch #254

Closed bast closed 1 year ago

bast commented 1 year ago

This is dependent on https://github.com/coderefinery/git-intro/issues/352

If we change to "main" as default, please check all screenshots and graphics.

dhanyapushpadas commented 1 year ago

Both lesson texts and figures need to update

dhanyapushpadas commented 1 year ago

I will work on the text.

johanhellsvik commented 1 year ago

and I will revise the figures

bast commented 1 year ago

Let me know if you need help with the box-arrow-figures. It is easy for me to regenerate them but maybe less easy for those who don't know the program (I wrote that little tool).

johanhellsvik commented 1 year ago

Aha, I see. I had planned to use Inkscape - but can try out the tool that you have created.

bast commented 1 year ago

Yes, please consider svg to be the generated result. It is better to change the sources (the txt files).

dhanyapushpadas commented 1 year ago

@bast I see that it is still master on intro lessons. I assume that it will be changed. On git collaborative text, how do you suggest , remove all mention of master or say main or master.

bast commented 1 year ago

@bast I see that it is still master on intro lessons. I assume that it will be changed. On git collaborative text, how do you suggest , remove all mention of master or say main or master.

Yes I did not manage yet but please assume it will happen this week. I recommend:

dhanyapushpadas commented 1 year ago

texts are changed accordingly https://github.com/coderefinery/git-collaborative/pull/259.

johanhellsvik commented 1 year ago

Most figures have now been revised, see #262 Some work remains.

johanhellsvik commented 1 year ago

Remaining work: Update 'master' to 'main' also in GitHub screenshots. Editing with a drawing program blurred the original screenshots, wherefore new screenshots would be desired. Adjust the positioning of boxes in content/img/centralized/04-local.svg, content/img/centralized/06-local.svg and content/img/centralized/07-local.svg in order to avoid overlap.