About this question
I had few files in .gitignore on my branch. On another branch, those files are missing. I wish to merge the other branch into my branch, and I do not care whether the files are ignored ot not. However, I am receiving the error : the following untracked working tree files would be overwritten by merge like below: The following intracked working tree files would be overwritten by merge How to change the pull command to overwrite the files, without shifting and erasing the files on my own?