Pull the latest update without stashing the current changes or merging the changes in the file

Question

I am git as my control version for my code repository. As I am using multiple computer desktop and laptop.Each time when I try to pull the branch with new changes git give the following message.

  error: Your local changes to the following files would be overwritten by merge:
       ..../index.php
  Please, commit your changes or stash them before you can merge.
  Aborting

I do not want to stash the file . So I am deleting the file and doing git pull

Any other method is much appreciated.

Do you want to simply overwrite your changes in your working tree? — quantumbyte, Mar 20 '14 at 19:32
have a look at this: http://stackoverflow.com/questions/692246/how-do-i-revert-one-file-to-the-last-commit-in-git I think it is relevant to your problem — quantumbyte, Mar 20 '14 at 19:48

score 1 · Accepted Answer · edited May 23 '17 at 10:26

1

To reset just one file, as commented by greenkeeper, tou can simply checkout that file to reset its content to what the repo currently holds:

git checkout -- index.php

If you have multiple files modified locally, and you don't have any work in progress (or it would be lost), you can simply do before pulling:

git reset --hard

But again, that would reset all modified files.

edited May 23 '17 at 10:26

Community

1
1

answered Mar 21 '14 at 07:11

VonC

1,262,500
529
4,410
5,250

Pull the latest update without stashing the current changes or merging the changes in the file

1 Answers1