Git-Checkout

git checkout --conflict=diff3 filepath

Checkout file with conflict in diff3 format

$$ git checkout --conflict=diff3 testfile.txt
$$ cat testfile.txt

Hello World
<<<<<<< ours
ABCAAAAAAAAAAAAAAAAA
||||||| base
ABCAA
=======
ABCAADGHLAAAAA
>>>>>>> theirs

git checkout --patch/-p filepath

checkout partial changes of a file