The main goal is to get the conflict resolution status of git merge, similar to how IDEA includes #conflict information in the git merge commit.
My intention is to retrieve information in the pre-commit hook of git, to determine if it’s a merge commit, but the conflict information can’t be obtained after using git add.
After the automatic merge failure of git merge, no hooks are triggered and the conflict information can’t be recorded. Is there any way to retrieve this conflict information after resolving the conflicts?
YuanMa is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.