gistfile1.txt

~/d/h/i/beat 3663-master-monitor-endpoint $ git status
On branch 3663-master-monitor-endpoint
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   ../../highland/providers/docker/storage.py
        modified:   ../../highland/requirements.txt
        modified:   ../../highland/tests/__init__.py
        modified:   ../../highland/tests/integration/test_highland.py
        modified:   ../agent/config.yml
        modified:   ../agent/scripts/start.sh
        modified:   ../api/api/builds/listeners/scheduling.py
        modified:   ../api/api/builds/serializers.py

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)

        both modified:   ../../clusters/local.yml
        both modified:   ../../highland/tasks/monitor_tasks.py
        deleted by us:   beat.py

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

        ../../clusters/#staging.yml#
        ../../highland/#monitor.py#
        ../../highland/tasks/#utils.py#
        ../api/api/builds/models/#buildrequest.py#