I ran into a merge conflict when a branch had changed a file and I was merging in another branch where the file had been deleted and placed in gitignore.   Some suggestions on handling this here: fetch – Force git to overwrite local files on pull. – Stack Overflow I used: git checkout <your-branch> -f I …

Continue reading ‘Git: Untracked working tree file would be overwritten by merge’ »