Highlights from Git 2.36 | The GitHub Blog — Changes to Git.

Things I wish Git had: Commit groups — A way to group commits so you can later see how some changes were created together.

foriequal0/git-trim: Automatically trims your branches whose tracking remote refs are merged or stray — Trim your local branches in Git after they were merged online.

Solving conflicts in composer.lock – Rafael Dohms — Another strategy for working with composer.lock merge conflicts.

Resolving composer merge conflicts | Theodo — Explains strategy for working through merge conflicts in composer.lock

Sublime merge — Something to take a look at for use with Git. As a cli only user of Git GUI tools always look to be very difficult, because it hides what's going on.

SQL interface to Git repositories, written in Go. https://docs.sourced.tech/gitbase