As the docs say, it’s best to install mergiraf as a merge driver
First grab the binary
cargo binstall mergiraf
Then configure git:
git config --global merge.mergiraf.name mergiraf git config --global merge.mergiraf.driver 'mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L'
Then make/edit your git config
mkdir -p ~/.config/git echo '* merge=mergiraf' >> ~/.config/git/attributes
Lastly enable diff3 conflict style
git config --global merge.conflictStyle diff3
There was an error while loading. Please reload this page.