<p>I've been using Git on Windows (msysgit) to track changes for some design work I've been doing.</p>

<p>Today I've been working on a different PC (with remote repo <code>brian</code>) and I'm now trying to merge the edits done today back into my regular local version on my laptop.</p>

<p>On my laptop, I've used <code>git pull brian master</code> to pull the changes into my local version. Everything was fine apart from the main InDesign document - this shows as a conflict.</p>

<p>The version on the PC (<code>brian</code>) is the latest one that I want to keep but I don't know what commands tells the repo to use this one. </p>

<p>I tried directly copying the file across onto my laptop but this seems to break the whole merge process.</p>

<p>Can anyone point me in the right direction?</p>

You have to resolve the conflict manually (copying the file over) and then commit the file (no matter if you copied it over or used the local version) like this
```
```
git commit -a -m "Fix merge conflict in test.foo"
```
```
Git normally autocommits after merging, but when it detects conflicts it cannot solve by itself, it applies all patches it figured out and leaves the rest for you to resolve and commit manually. The
Git Merge Man Page
, the
Git-SVN Crash Course
or
this
blog entry might shed some light on how it's supposed to work.
Edit:
See the post below, you don't actually have to copy the files yourself, but can use
```
```
git checkout --ours -- path/to/file.txt
git checkout --theirs -- path/to/file.txt
```
```
to select the version of the file you want. Copying / editing the file will only be necessary if you want a mix of both versions.
Please mark mipadis answer as the correct one.