Skip to content

Fix #323: Always accept local changes to resolve merge conflicts - #325

Merged
mdboom merged 4 commits into
mainfrom
handle-merge-conflicts
Jan 9, 2025
Merged

Fix #323: Always accept local changes to resolve merge conflicts#325
mdboom merged 4 commits into
mainfrom
handle-merge-conflicts

Merge branch 'main' into handle-merge-conflicts

cfb9c28
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs