Are there open source solutions for automating merge conflicts?

Question

git

I saw in some forks that they constantly pull changes from the repository, after some changes, they write a comment like:

-a = 2
+a = 4 //FORKNAME EDIT

Are there solutions available to implement conflict resolution automation in a similar way? (Or are these comments just placed to manually maintain their own changes?)

Answer 1

This makes the merge tool in git so that you can understandably resolve the conflict manually. In other cases, merge goes smoothly. Pull request (or merge request) is the same merge