Tagged git
Things I wish Git had: Commit groups
→ blog.danieljanus.pl/2021/07/01/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
→ github.com/foriequal0/git-trim
Trim your local branches in Git after they were merged online.
Solving conflicts in composer.lock – Rafael Dohms
→ blog.doh.ms/2016/11/28/solving-conflicts-in-composer-lock
Another strategy for working with composer.lock merge conflicts.
Resolving composer merge conflicts | Theodo
→ blog.theodo.com/2013/03/resolving-composer-merge-conflicts
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.