Then, When the merge encountered a conflict, print the message Encountered a merge conflict. within the terminal (not the log). Merge commits differ from other commits: they document as parents both equally the head of the current branch (known as the very first parent) and The pinnacle of the branch https://essayv.com/projects/