How to override unmerged git checkout with upstream version

Question

I’m attempting to revert a file modified locally to the version that is most recent upstream, effectively undoing my changes. ``` $ git checkout -- Jovie/Jovie-Info.plist error: path ‘Jovie/Jovie-Info.plist' is unmerged ``` Using -f alters the error to warn, but still won’t make the change (???) ``` $ git checkout -f -- Jovie/Jovie-Info.plist warning: path ‘Jovie/Jovie-Info.plist' is unmerged ``` The file itself looks like this: ``` $ git diff Jovie/Jovie-Info.plist diff --cc Jovie/Jovie-Info.plist index 6c576d9,0209baa..0000000 --- a/Jovie/Jovie-Info.plist +++ b/Jovie/Jovie-Info.plist @@@ -50,7 -50,7 +50,11 @@@ CFBundleVersion ++<<<<<<< Updated upstream + 5922 ++======= + 5918 ++>>>>>>> Stashed changes Fabric APIKey ``` How do I override the local files and apply upstream changes?

Accepted Answer

You might need to reset the file first, before doing the checkout:

```
git reset -- Jovie/Jovie-Info.plist
git checkout -- Jovie/Jovie-Info.plist
```

The reset un-stage the changes in progress (here the merge, with the conflict markers in the file). Then the checkout can restore the index with the last commit content.

How to override unmerged git checkout with upstream version

Solution

Problem

Related problems