git resolve conflicts

Goal

I want to resolve file with conflicts

Recipe

First, when a file is in conflict state, git removes it from tracking. The steps are about to edit the file and re-add it:
Here is a sample of conflicted file content

 <<<<<<< HEAD:file.txt Hello world ======= Goodbye >>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt 

Just edit it and then

 git add file.txt git commit