there's a lot that could be improved with conflict resolution and merge trains/s...

		trenchpilgrim 13 days ago \| parent \| context \| favorite \| on: GitHub is no longer independent at Microsoft after... there's a lot that could be improved with conflict resolution and merge trains/stacked merges. see https://pijul.org for what's possible but not available in git