[BUG] Conflict resolution is always selecting OURS and for binary files and not prompting for selection

[mjfs]

When a conflict resolution is needed SourceGit (v2026.15) does as expected for text files - it gives the user an option to select the version of a file. This is however not the case for binary files, where OURS is the version automatically selected - e.g. one can just stage the changes and commit them. A minimal example for both text and binary conflicts is attached bellow (after running the examples open local-repo).

A BINARY CONFLICT EXAMPLE

New-Item -ItemType Directory binary-conflict-example
git init --bare --initial-branch=main binary-conflict-example/remote-repo.git
git init --initial-branch=main binary-conflict-example/local-repo

Set-Location binary-conflict-example/local-repo
git config user.name "Binary Conflict Demo"
git config user.email "demo@example.invalid"
git remote add origin ../remote-repo.git

[IO.File]::WriteAllBytes("$PWD/artifact.bin", [byte[]](0, 1, 2, 3))
git add artifact.bin
git commit -m "base: add binary artifact"
git push -u origin main

git switch -c remote-change
[IO.File]::WriteAllBytes("$PWD/artifact.bin", [byte[]](0, 10, 20, 30))
git commit -am "remote: change binary artifact"
git push origin HEAD:main

git switch main
[IO.File]::WriteAllBytes("$PWD/artifact.bin", [byte[]](0, 40, 50, 60))
git commit -am "local: change binary artifact"

git merge origin/main
git status --short --branch

A TEXT CONFLICT EXAMPLE

New-Item -ItemType Directory text-conflict-example
git init --bare --initial-branch=main text-conflict-example/remote-repo.git
git init --initial-branch=main text-conflict-example/local-repo

Set-Location text-conflict-example/local-repo
git config user.name "Text Conflict Demo"
git config user.email "demo@example.invalid"
git remote add origin ../remote-repo.git

Set-Content artifact.txt "base version"
git add artifact.txt
git commit -m "base: add text artifact"
git push -u origin main

git switch -c remote-change
Set-Content artifact.txt "remote version"
git commit -am "remote: change text artifact"
git push origin HEAD:main

git switch main
Set-Content artifact.txt "local version"
git commit -am "local: change text artifact"

git merge origin/main
git status --short --branch

Update: formatting fix for consistency

[love-linger]

Currently you can use context menu to resolve conflicts for binary files.

[love-linger]

Done. You can download and test the latest CI build from GitHub Action.

[mjfs]

Thank you for such a prompt reply! There is however still an issue remaining with the binary files if there is a converter defined for viewing/diffing - e.g. a .docx file with a pandoc defined as the converter still results in the same implicit auto-accept OURS handling of that binary file.

A DOCX WITH PANDOC CONFLICT EXAMPLE

New-Item -ItemType Directory docx-conflict-example/docx/word, docx-conflict-example/docx/_rels
Set-Content -LiteralPath docx-conflict-example/docx/'[Content_Types].xml' '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/></Types>'
Set-Content docx-conflict-example/docx/_rels/.rels '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/></Relationships>'
git init --bare --initial-branch=main docx-conflict-example/remote-repo.git
git init --initial-branch=main docx-conflict-example/local-repo

Set-Location docx-conflict-example
Set-Content docx/word/document.xml '<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body><w:p><w:r><w:t>Base version</w:t></w:r></w:p></w:body></w:document>'
[IO.Compression.ZipFile]::CreateFromDirectory("$PWD/docx", "$PWD/local-repo/document.docx")

Set-Location local-repo
git config user.name "DOCX Conflict Demo"
git config user.email "demo@example.invalid"
git remote add origin ../remote-repo.git
git config diff.docx.textconv "pandoc --to=plain"
Set-Content .gitattributes "*.docx binary diff=docx"
git add .
git commit -m "base: add Word document"
git push -u origin main

git switch -c remote-change
Set-Location ..
Set-Content docx/word/document.xml '<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body><w:p><w:r><w:t>Remote version</w:t></w:r></w:p></w:body></w:document>'
Remove-Item local-repo/document.docx
[IO.Compression.ZipFile]::CreateFromDirectory("$PWD/docx", "$PWD/local-repo/document.docx")
Set-Location local-repo
git commit -am "remote: change Word document"
git push origin HEAD:main

git switch main
Set-Location ..
Set-Content docx/word/document.xml '<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body><w:p><w:r><w:t>Local version</w:t></w:r></w:p></w:body></w:document>'
Remove-Item local-repo/document.docx
[IO.Compression.ZipFile]::CreateFromDirectory("$PWD/docx", "$PWD/local-repo/document.docx")
Remove-Item -Recurse -Force docx
Set-Location local-repo
git commit -am "local: change Word document"

git merge origin/main
git status --short --branch

[love-linger]

The FILE CONFLICTS ARE RESOLVED page means SourceGit does not find conflict markers in this file (the file is the same with the one in one side of merge) and as the description says: You can stage this file now. In this time, the content of file in current worktree is safe to stage.

SourceGit cannot distinguish whether the current file state came about immediately after a merge operation, or resulted from you manually editing the conflicted file to make it identical to OURS. It can only uniformly display FILE CONFLICTS ARE RESOLVED. At this point, users can still use the options in the context menu to change the file state.