╰─ ls inventory/group_vars/hv
inventory/group_vars/hv
╭─  192.168.42.147   213.162.49.218    2   ~/depots/git/ansible-sol-venv/ansible-sol     capacity-planning-2 | cherry                                                                          17:56:50  ansible-sol-venv 
╰─ git add inventory/group_vars/hv
╭─  192.168.42.147   213.162.49.218    2   ~/depots/git/ansible-sol-venv/ansible-sol     capacity-planning-2 | cherry                                                                          17:57:02  ansible-sol-venv 
╰─ git status
On branch capacity-planning-2
You are currently cherry-picking commit 0f66def8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

    new file:   inventory/group_vars/hv
    new file:   roles/capacity-planning/files/capacityPlanningTotalHypervisors.py
    new file:   roles/capacity-planning/templates/cron.j2

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

    deleted by us:   inventory/group_vars/infra-backup
    deleted by us:   inventory/host_vars/librenms-vm.sup.xguard.net
    deleted by us:   playbooks/groups/capacity-planning/main.yml
    deleted by us:   roles/capacity-planning/defaults/main.yml
    deleted by us:   roles/capacity-planning/files/capacityPlanningBackups.py
    deleted by us:   roles/capacity-planning/files/capacityPlanningHypervisors.py
    deleted by us:   roles/capacity-planning/files/capacityPlanningSAN.py
    deleted by us:   roles/capacity-planning/files/stats.sh
    deleted by us:   roles/capacity-planning/tasks/main.yml
    deleted by us:   roles/capacity-planning/templates/capacityPlanning.json.j2