Skip to content

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

Open
JEdward7777 wants to merge 1 commit into
genesis-ai-dev:mainfrom
JEdward7777:JEL_improve_default_merge
Open

Added simple 3 way merge for unknown files instead of override.#798
JEdward7777 wants to merge 1 commit into
genesis-ai-dev:mainfrom
JEdward7777:JEL_improve_default_merge

Commits

Commits on Mar 24, 2026