Dealing with conflictsIf the case is more complex, you can run the following command get thecommit details including the author and its descriptive message and take somedecision based on that:git show commit_idSometimes, if we cannot solve the conflict by ourselves we can contact thedeveloper author of the commit to get some more information that might help usto resolve the conflict.