npm

mergiraf

Syntax-aware git merge driver that reduces conflicts in code

brewmacoslinux
Try with needOr install directly
Source

About

Syntax-aware git merge driver

Commands

mergiraf

Examples

Configure mergiraf as your default merge driver for all repositories$ git config --global merge.mergiraf.driver 'mergiraf %O %A %B -o %A'
Use mergiraf to merge specific branches with syntax-aware conflict resolution$ git merge feature-branch
Initialize mergiraf configuration in your git repository$ mergiraf init