cant git pull because of .gitignore untracked

Question

After performing: git pull origin master

I get the following:

* branch            master     -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
.gitignore
Please move or remove them before you merge.

Aborting

How can I continue ?

Answer 1

The output telling you that you have uncommitted changes.

You can do one of the following:

To add & commit your changes:

# Add and commit changes
git add . && git commit -m"Message"

To discard changes:

# discard your changes
git checkout -- .gitignore