How to Quick Solve a Git Conflict?

When you are in the conflct state simply type:

# git checkout --ours .
# git add .

to keep all your changes, or:

# git checkout --theirs .
# git add .

to do the opposite.