In our run.sh, rebase not merge the git pull to update local code.
  If there are local commits, or on a different branch than master
  this was causing the editor to popup with a merge commit message
  and was disrupting the run.sh script.