Add configurable auto-resolution for log conflicts#57

tiagoarroz wants to merge 4 commits into

silvanocerza:mainsilvanocerza/github-gitless-sync:mainfrom

tiagoarroz:codex-auto-resolve-log-conflictstiagoarroz/github-gitless-sync:codex-auto-resolve-log-conflictsCopy head branch name to clipboard