All I could find was this implementation: https://github.com/drewmccormack/Forked/blob/daa1082ca0f8d4f5dc598be2887bdafcaf3e4c4b/Sources/Forked/Mergeable.swift h

All I could find was this implementation: https://github.com/drewmccormack/Forked/blob/daa1082ca0f8d4f5dc598be2887bdafcaf3e4c4b/Sources/Forked/Mergeable.swift https://github.com/drewmccormack/Forked/blob/daa1082ca0f8d4f... Beyond that, how does manual conflict resolution work, if it’s even possible? Git and the galaxy of tooling around it can’t handle all conflicts automatically.