git status
On branch stellarapp_changes
Your branch and 'origin/stellarapp_changes' have diverged,
and have 1 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

        deleted:    config.xml
        new file:   design/icon/Icon-40.png
        new file:   design/icon/Icon-40@2x.png
        new file:   design/icon/Icon-40@3x.png
        new file:   design/icon/Icon-50.png
        new file:   design/icon/Icon-50@2x.png
        new file:   design/icon/Icon-60@2x.png
        new file:   design/icon/Icon-60@3x.png
        new file:   design/icon/Icon-72.png
        new file:   design/icon/Icon-72@2x.png
        new file:   design/icon/Icon-76.png
        new file:   design/icon/Icon-83.5@2x.png
        new file:   design/icon/Icon-Small.png
        new file:   design/icon/Icon-Small@2x.png
        new file:   design/icon/Icon-Small@3x.png
        new file:   design/icon/Icon.png
        new file:   design/icon/Icon@2x.png
        new file:   design/icon/icon-76@2x.png
        new file:   design/splash.bk/splashscreen.png
        new file:   design/splash.bk/splashscreen.psd
        new file:   design/splash/Default-568h@2x.png
        new file:   design/splash/Default-667h@2x.png
        new file:   design/splash/Default-Portrait-736h@3x.png
        new file:   design/splash/Default-Portrait.png
        new file:   design/splash/Default-Portrait@2x.png
        new file:   design/splash/Default@2x.png
        modified:   package.json
        modified:   src/main/views/dashboard-state/views/question-view/question.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   appToUsApp/config.xml

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   package.json
        modified:   src/app.js
        modified:   src/assets/scss/question-view.scss
        modified:   src/main/views/dashboard-state/views/question-view/question-view.html

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        src/assets/css/font-awesome.min.css