Taylan Kammer <[email protected]> wrote: > Magit is a very nice front-end to Git and aides with merging as well. > https://magit.vc/manual/magit/Resolving-Conflicts.html
The linked manual says: | Magit does not provide its own tools for conflict resolution
signature.asc
Description: PGP signature
