[Gimp-docs] .gitignore

[julien]

Hi,

I have added '*~' to .gitignore, to ignore back files.

My git status is:

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   .gitignore
#       modified:   po/fr/glossary.po
#       modified:   src/glossary/glossary.xml

When I run git pull, I get:

Updating 51fb9db..16adef3
error: Entry '.gitignore' would be overwritten by merge. Cannot merge.

and when I run git pull --rebase:
refusing to pull with rebase: your working tree is not up-to-date

What does that mean?

Julien