binary-conflict improves git's binary merge behavior. (It's for proof of concept)
Git only indicates that files have coflicted, and should be confirmed through git checkout --ours -- <path> or git checkout --theirs -- <path>.
This project makes it easy to select by showing files base branch and their branch.
After installing this, define merge behavior in .git/config file.
[merge "binary-merge"]
name = Create base, ours, theirs file for conflict
driver = ../target/release/binary-conflict %O %A %B %P
Then, You can apply it in .gitattributes file.
[attr]BINARY diff=binary merge=binary-merge -text
*.png BINARY
cd example && ./example.shGrapic source
