On a git conflict, I can currently do:
git diff path/to/some/file.txt
... after reviewing the diff, usually I want to do:
git checkout --theirs path/to/some/file.txt && git add path/to/some/file.txt
It's painstaking to edit both paths each time, so I'd like to be able to do the following:
git checkout --theirs <ref> && git add path/to/some/file.txt
<ref> refers to file.txt.
Any way to do this in bash?