https://github.com/capslocky/git-rebase-via-merge

Resolve conflicts with minimum pain.

conflict git merge rebase

Last synced: 11 Mar 2026

https://github.com/capslocky/git-commit-tree-example

Last synced: 31 Jan 2026