• Register
0 votes
177 views

Problem :

How can I ignore the below error message on the Git pull?

Your local changes to the following files would be overwritten by merge

What if I just want to overwrite them?

I Have already tried many things like git pull -f, but nothing really works for me.To be very clear, I just want to overwrite the specific changes and not the everything.

6 5 3
7,540 points

Please log in or register to answer this question.

1 Answer

0 votes

Solution :

  1. If you just want to remove all your local changes from the working copy, just stash them with the below command :

         git stash save --keep-index

  1. If you just do not need them anymore then you now can simply drop that stash with the below command :

         git stash drop

If you really want to just overwrite the specific parts of your local changes, there are two possibilities as shown below :

  1. Commit everything that you don't want to get overwritten and use the method above for the rest.
  1. You can use git checkout path/to/file/to/revert for your changes those you wish to overwrite. Also please make sure that your file is not staged via git reset HEAD path/to/file/to/revert.

If you follow above mentioned procedure then you will surely fix your all above mentioned issues.

9 7 4
38,600 points

Related questions

0 votes
1 answer 14 views
14 views
Problem: Why I got the error > Error your local changes to the following files would be overwritten by merge
asked Apr 29 ummeshani 10.8k points
0 votes
1 answer 32 views
32 views
Problem: Can anyone tell me the solution of this problem? please, commit your changes or stash them before you can switch branches.
asked Mar 23 Ifra 37.2k points
0 votes
2 answers 307 views
307 views
Problem : I have the project with two branches as staging and beta. I try to develop on staging, and use my master branch to fix the bugs. git checkout master And do the stuff on it : git add fileToAdd git commit -m "bug fixed ... be overwritten by checkout: src/Pro/ConvocationBundle/Controller/DefaultController.php Please, commit your changes or stash them before you can switch branches. Aborting
asked Dec 18, 2019 alecxe 7.5k points
0 votes
1 answer 24 views
24 views
Problem: your local changes to the following files would be overwritten by merge
asked Mar 4 ummesalma 29.2k points
0 votes
1 answer 29 views
29 views
Problem: Urgent problem, any help: Error: the following untracked working tree files would be overwritten by merge:
asked Mar 13 Wafa Abu Yousef 6.1k points
0 votes
1 answer 15 views
15 views
Problem: did anyone face this situation ! help : Error: the following untracked working tree files would be overwritten by merge.
asked Mar 6 Wafa Abu Yousef 6.1k points
0 votes
2 answers 3.5K views
3.5K views
Problem : On the branch I had some files in the .gitignore On the different branch those files are not. I am trying to merge the different branch into my branch, and I don't bother if those files are no longer overlooked or not. Unfortunately I get below ... by merge” How should I modify the pull command to overwrite those files, without needing to find, move or delete those files by myself?
asked Jan 6, 2020 alecxe 7.5k points
1 vote
2 answers 2.6K views
2.6K views
Problem : On the branch which I had some of my files in .gitignore On the different branch those files are not present. So I want to merge the different branch into my branch and I really do not care about those files if they are no longer ignored or not. But ... by merge How can I modify the pull command to overwrite the files, without me needing to find, move or delete the files by myself?
asked Dec 27, 2019 alecxe 7.5k points
0 votes
1 answer 19 views
19 views
Problem: HELP! I need help understanding this error > Git the following untracked working tree files would be overwritten by merge
asked Apr 30 ummeshani 10.8k points