git part 1

added 1 commit

• ed222bb6 - 2022-03-31_git-triology-part-1

Compare with previous version

requested review from @laurent.heirendt and @marina.popleteeva

marked this merge request as ready

@laurent.heirendt @marina.popleteeva any comments welcome :)

added 1 commit

• 05734d80 - remove unused picture

Compare with previous version

added 1 commit

• 746ddd7e - remove unused picture

Compare with previous version

added 1 commit

• 77999692 - remove overview

Compare with previous version

What about to change "In other words" to "in git words"?

Slide 21, Time to practice! which stats with "Open Web IDE"

Screenshot is too small and too scary :) Take a part of file only.

Slide 23, New term: merge You have one commit on new branch right now but diagram depicts 2. It is confusing. Could you please change diagram to have one or many (circle, three dots, circle)?

Formating issue: Merge Branch A to branch B - first B is capital, second is small.

I do not understand the phrase "Use the interface to make use of your peers to review your code".

Slide 25, practice with merge request.

Screenshot is too small! Leave only upper part of merge request interface. Where branches are visible, title and a small part of description field.

Slide 28, Wrap-up glossary.

You did not talk about pull request, this term should not be in wrap-up glossary.

Do not commit to master/develop, but submit a Pull Request (PR) - pull request? You were talking about merge requests only. If it is a synonymous it should be clearly stated before. Otherwise, people will be confused.

PR everywhere on this slide:

• pull request (PR) did not exist before this slide
• you have enough space to write in full words, people do not need to remember new abbreviation for one last slide only. Consider to write in full words

(after multiple separate git add commands) - people do not know what is it. Do not put it, it confuse and scare :) Better to write in a way "with exceptions that out of scope of this course", "in some special way that is out of scope of this course". I mean, indicate that something exist but do not go into details.

added 1 commit

• 3de9616b - update best practices - remove cmd related stuff

Compare with previous version

added 5 commits

• 4c529342 - figure web-ide_edit-file.png in higher resolution
• 57286137 - fix typo
• b7db03e3 - rephasing: peers can review the code
• 1a3d035e - picture merge_GUI_detail.png in better resolution
• b282aff4 - pull request is not used as the pull command is not introduced

Compare with previous version

added 1 commit

• 5322034b - fix typo: triology->trilogy

Compare with previous version

resolved all threads

thanks for this, both @vilem.ded for creating it and @marina.popleteeva for reviewing!

well done!

As most of you will be gone now for a few days, I will merge now, and then I will put in another MR for some changes.

mentioned in commit f194cee0

merged