I've been using git for 13+ years and I still have no idea what "theirs" and "ours" mean when solving a conflict.

Ask me anything.

#git