Letting a coding agent resolve merge conflicts without losing intent

Hand the agent the purpose of both changes, keep a restore point and check the combined result. Resolving a conflict is not just removing markers from a file. You need to verify that the behavior each