Github

Possibly useful git command :
git checkout -m -- < file >

This command will checkout a version of your file with the conflicting parts again. If you accidentally do git checkout --ours < file > but afterwards change your mind, you can do that command to see the conflicted file again.