I was doing some work in my repository and noticed a file had local changes. I didn\'t want them anymore so I deleted the file, thinking I can just checkout a fresh copy. I
I wanted to keep my changes so, I just fix this doing...
git add . git commit -m "Title" -m "Description" (so i have a commit now example: 123abc) git checkout YOURCURRENTBRANCH git merge 123abc git push TOYOURCURRENTBRANCH
that work for me