CODEWITHSUNDEEP
gitgithub
Mehran
Mehran

Reputation: 16911

Syncing my github forked repository with the upstream and keeping my changes

I'm trying to sync my github forked repository with the original one. I've followed the instructions on the github's page. But when I try to merge my own master branch with upstream's, it says:

$ git merge upstream/master
error: Your local changes to the following files would be overwritten by merge:
    ... a list of files ...
Please, commit your changes or stash them before you can merge.
Aborting

It's in the case that when I git commit it says nothing to commit (working directory clean)!

What am I missing?

Upvotes: 1

Views: 271

Answers (1)

yuval
yuval

Reputation: 2060

Please check your line endings: https://help.github.com/articles/dealing-with-line-endings

Upvotes: 1

Related Questions