While trying to merge, I get: "error: Your local changes to the following files would be overwritten by merge: Another file readme.md Please, commit your changes or stash them before you can merge. Aborting"

[snigdhajain]

How to force overwriting of local changes in this case?

[Ziliboba]

Seems that you have uncommited changes on your current branch. Do git commit -m "commit message", and then try to merge again.

[NickGe]

:+1:

[saranicole]

Make sure you have done a git pull first: git pull

If you have and you still have trouble you might have local uncommitted changes as @Ziliboba mentioned.

To stash (preserves local changes WITHOUT committing them): git stash \ git pull \ git stash pop

To reset (discards all local changes) git reset --hard

[mkaleem4]

where am i entering these commands??

[jamalfrnk]

git bash

[hualongfeng]

I also see this error, but my branch clean, that is, it has be commit. How do I solve it.

[himanshu4git]

Faced same issue but my reason was quite different. I setup git on windows powershell few days ago . later i switched to cygwin and was doing git pull. :) switching back to windows powershell resolved the issue.

[kirbyfern]

@mkaleem4 on the terminal on your current local branch in your current project folder

[sslsolutions]

i want to keep the changes in my local branch