This one is part of META issue #1931138: Fixing all 'single marker' issues

Every time I try to git pull an update, I get a warning that sites/default/files/public/js/gmap_markers.js needs updating

$ git pull
sites/default/files/public/js/gmap_markers.js: needs update
refusing to pull with rebase: your working tree is not up-to-date
[okul]$ git st
# On branch master
# Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
#
# Changed but not updated:
# (use "git add ..." to update what will be committed)
# (use "git checkout -- ..." to discard changes in working directory)
#
# modified: sites/default/files/public/js/gmap_markers.js
#
no changes added to commit (use "git add" and/or "git commit -a")

I don't understand why a .js file would be changing.

Comments

Danny Englander’s picture

I think I have a similar issue, all of the sudden, in the root of my site, js/gmap_markers.js shows up in my local git repo as "added". However I am on Drupal 6 so I don't know if I should open a separate issue for this.

podarok’s picture

Status: Active » Closed (fixed)

that file generated my module depending of configuration and shouldn`t be added to repository
use .gitignore at root

sites/default/files

for disabling it

podarok’s picture

Issue summary: View changes

Updated issue summary.