Git: more in depth

[dbosk]

Go more into merge conflicts and other similar problems that can occur. Work with pull requests. How to update pull requests. Good workflow for "Git ops".

Chapter 2 in Pro Git covers this.

Cyrille wants 4-8 h in size for inclusion in his course.

Ric: Have repos set up with problems. [We can have the branches set up with conflicts and the assignments is to merge them.] This can be distributed using RepoBee.

The revert problem is also worth covering. That gives insight into how Git works. Particularly when you use revert on a branch and later merge.

Some of chapter 3 in Pro Git as well.

I like Git Magic better than Pro Git though.

There is also the Shell Tutor ITiCSE'24 version, Shell Tutor that can be adapted.