How to ignore an error on git pull about my local changes would be overwritten by merge

0 votes

Hi Team,

I am trying to run the Git pull command. But it is showing me the below error.

Your local changes to the following files would be overwritten by merge
Jan 5 in Git & GitHub by akhtar
• 38,170 points
689 views

1 answer to this question.

0 votes

Hi Team,

If you want to remove all local changes - including files that are untracked by git - from your working copy, simply stash them:

$ git stash push --include-untracked

If you don't need them anymore, you now can drop that stash.

$ git stash drop
answered Jan 5 by MD
• 95,180 points

Related Questions In Git & GitHub

0 votes
1 answer

Error: git pull fails “unable to resolve reference” “unable to update local ref”

This happens when there are unnecessary files ...READ MORE

answered Jul 26, 2018 in Git & GitHub by Sophie may
• 10,550 points
10,030 views
0 votes
1 answer
+1 vote
1 answer

How to force “git pull” to overwrite local files?

Hi@akhtar, First, you need to download the latest from ...READ MORE

answered Sep 4, 2020 in Git & GitHub by MD
• 95,180 points
366 views
0 votes
1 answer

How to pull from a Git repository through an HTTP proxy?

Hi@akhtar, You can set the HTTP proxy that Git ...READ MORE

answered Nov 21, 2020 in Git & GitHub by MD
• 95,180 points
93 views
+15 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 26, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
1,066 views
+2 votes
1 answer
0 votes
1 answer

error on branch master nothing to commit, working directory clean, when try to commit my changes.

Hi@akhtar,  If you already have a .git/ folder ...READ MORE

answered Apr 10, 2020 in Git & GitHub by MD
• 95,180 points
4,887 views
0 votes
1 answer

How to create branch in GitHub from my local Git repo?

Hi@akhtar, To sync your existing branch in GitHub, ...READ MORE

answered May 7, 2020 in Git & GitHub by MD
• 95,180 points
139 views