How to split file into ours and theirs on conflict

Question

I there a way to get 2 copies of file where first will have remote content and the second with local content

Answer 1

I don't think that there is a git option to keep both versions of the file in two copies.

But you can easily acheive this goal with the following commands :

git merge the_branch
git checkout --theirs -- path/to/file ; mv path/to/file path/to/file.theirs
git checkout --ours -- path/to/file ; mv path/to/file path/to/file.ours
git checkout -m -- path/to/file

In the end you have three files :

• file.theirs, with their version;
• file.ours, with your version;
• file, with both versions and conflicts marks.