Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to "main" as default branch #254

Closed
bast opened this issue Aug 23, 2023 · 11 comments · Fixed by #266
Closed

Switch to "main" as default branch #254

bast opened this issue Aug 23, 2023 · 11 comments · Fixed by #266
Assignees

Comments

@bast
Copy link
Member

bast commented Aug 23, 2023

This is dependent on coderefinery/git-intro#352

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

@johanhellsvik johanhellsvik self-assigned this Aug 24, 2023
@dhanyapushpadas
Copy link
Contributor

Both lesson texts and figures need to update

@dhanyapushpadas
Copy link
Contributor

I will work on the text.

@johanhellsvik
Copy link
Contributor

and I will revise the figures

@bast
Copy link
Member Author

bast commented Aug 24, 2023

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
Copy link
Contributor

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

@bast
Copy link
Member Author

bast commented Aug 24, 2023

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

@dhanyapushpadas
Copy link
Contributor

@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
Copy link
Member Author

bast commented Aug 24, 2023

@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:

  • mention "main" instead of "main or master"
  • however please also assume that somebody joins day 3 and hasn't been there on day 1 or 2 so add a step where we get everybody on the same page

@dhanyapushpadas
Copy link
Contributor

texts are changed accordingly #259.

@johanhellsvik
Copy link
Contributor

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

@johanhellsvik
Copy link
Contributor

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants