Error when merging master branch to another branch

nus-cs2113-AY1920S2 / forum

4 stars 0 forks source link

Error when merging master branch to another branch #93

Closed DeetoMok closed 4 years ago

DeetoMok commented 4 years ago

I uploaded a png file on my local repo, and now am having trouble merging that particular branch to my master branch. This is the error that appears, and I am not sure how to solve it.

DeetoMok commented 4 years ago

I have found the problem. The file was untracked, and once I removed it, and commited the new changes, it works fine.