Skip to content

Added simple 3 way merge for unknown files instead of override. #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JEdward7777 wants to merge 1 commit into
base: main
Choose a base branch
from

Added simple 3 way merge for unknown files instead of override.

f0b74f9
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
Open

Added simple 3 way merge for unknown files instead of override. #798

Added simple 3 way merge for unknown files instead of override.
f0b74f9
Select commit
Loading
Failed to load commit list.
Node 20 • ubuntu-latest
succeeded Mar 24, 2026 in 3m 50s