How do I overwrite changes on my local copy

Question

I ran git pull origin master and I get the following message because I have my changes in a single file. What command should I issue so that the changes are overwritten on my local copies.

branch master -> FETCH_HEAD Updating 7sc4344..c81c437 error: Your local changes to 'foo.txt' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.

Jorge Israel Peña · Accepted Answer · 2011-09-12T04:02:19.417

3

You can try checking out the file so that your changes are removed with git checkout -- foo.txt and then you'll no longer have changes so the merge should go through.

To change everything back to normal, do git reset --hard HEAD

edited Sep 12 '11 at 04:02

answered Sep 12 '11 at 03:45

Jorge Israel Peña

34,719
16
88
119

I have many such files in several other directories, is there a command to overwrite all such changes. – Jason Sep 12 '11 at 03:48

score 2 · Answer 2 · edited May 23 '17 at 12:08

2

Look at this: How do I force "git pull" to overwrite local files?

git clean
git pull

edited May 23 '17 at 12:08

Community

1
1

answered Sep 12 '11 at 03:52

Rahul

1,838
16
32

How do I overwrite changes on my local copy

2 Answers2