CODEWITHSUNDEEP
gitgithubversion-control
user5911925
user5911925

Reputation:

Git cannot merge due to untracked working tree

enter image description here

This is printed when trying to merge.

Upvotes: 0

Views: 29

Answers (1)

merlin2011
merlin2011

Reputation: 75545

If you want to keep the local copy, then you should git add and git commit it before you merge.

git add .gitignore
git commit -m 'Adding gitignore file'

If you want to replace the local copy, just delete the file.

Upvotes: 1

Related Questions