Home/ Questions/Q 6554353
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-25T12:41:22+00:00

I ran git pull origin master and I get the following message because I

  • 0

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.
Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    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

    • 0