On branch bug_24975
Your branch and 'upstream/master' have diverged,
and have 14 and 3334 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean