When I git pull origin development
, I got error:
error: Untracked working tree file '<path-to-file>' would be overwritten by merge
The reason is because one file which is in the remote development branch
is not put to git in my local project (I don't want that file in version control, so did git rm
). But on remote development
, that file is exit for version control
How to resolve this problem? Basically, I want the remote branch also remove the file from version control.