Cite
Mergiraf can solve a wide range of Git merge conflicts. That’s because it’s aware of the trees in your files! Thanks to its understanding of your language, it can often reconcile the needs of both sides.
Install
Cargo
cargo install --locked mergirafbinstall
cargo binstall mergiraf