Resolving Conflicts During Git Merge

How to recognise and subsequently resolve conflicts when performing a merge using Git