[gio@archlinux helm]$ git checkout master
Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 1 and 27 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
[gio@archlinux helm]$ git branch
  anomalias
* master
  recursos
  resources-control
[gio@archlinux helm]$ git pull
remote: Enumerating objects: 76, done.
remote: Counting objects: 100% (76/76), done.
remote: Compressing objects: 100% (47/47), done.
remote: Total 76 (delta 62), reused 35 (delta 29)
Unpacking objects: 100% (76/76), done.
From gitlab.stilingue.com.br:Kubernetes/helm
   28a44c9..79f11bf  master            -> origin/master
   212257a..2dd70d3  resources-control -> origin/resources-control
Auto-merging deploys/santafe.yaml
CONFLICT (content): Merge conflict in deploys/santafe.yaml
Auto-merging deploys/psd.yaml
CONFLICT (content): Merge conflict in deploys/psd.yaml
Auto-merging deploys/prefeitura-rio.yaml
CONFLICT (content): Merge conflict in deploys/prefeitura-rio.yaml
Auto-merging deploys/performance-realtime.yaml
Auto-merging deploys/omelete-ccxp.yaml
CONFLICT (content): Merge conflict in deploys/omelete-ccxp.yaml
Auto-merging deploys/novo-discurso.yaml
CONFLICT (content): Merge conflict in deploys/novo-discurso.yaml
Auto-merging deploys/nobullshit.yaml
CONFLICT (content): Merge conflict in deploys/nobullshit.yaml
Auto-merging deploys/naturacosmeticos.yaml
CONFLICT (content): Merge conflict in deploys/naturacosmeticos.yaml
Auto-merging deploys/leiaute.yaml
CONFLICT (content): Merge conflict in deploys/leiaute.yaml
Auto-merging deploys/itau.yaml
CONFLICT (content): Merge conflict in deploys/itau.yaml
Auto-merging deploys/inpress.yaml
CONFLICT (content): Merge conflict in deploys/inpress.yaml
Auto-merging deploys/hydro.yaml
CONFLICT (content): Merge conflict in deploys/hydro.yaml
Auto-merging deploys/fsb.yaml
CONFLICT (content): Merge conflict in deploys/fsb.yaml
Auto-merging deploys/first.yaml
CONFLICT (content): Merge conflict in deploys/first.yaml
Auto-merging deploys/first-dedicado.yaml
CONFLICT (content): Merge conflict in deploys/first-dedicado.yaml
Auto-merging deploys/first-dedicado-twitter.yaml
CONFLICT (content): Merge conflict in deploys/first-dedicado-twitter.yaml
Auto-merging deploys/first-dedicado-blogs.yaml
CONFLICT (content): Merge conflict in deploys/first-dedicado-blogs.yaml
Auto-merging deploys/fetcher-api.yaml
Auto-merging deploys/febraban.yaml
CONFLICT (content): Merge conflict in deploys/febraban.yaml
Auto-merging deploys/fbiz.yaml
CONFLICT (content): Merge conflict in deploys/fbiz.yaml
Auto-merging deploys/dpzt.yaml
CONFLICT (content): Merge conflict in deploys/dpzt.yaml
Auto-merging deploys/doria.yaml
CONFLICT (content): Merge conflict in deploys/doria.yaml
Auto-merging deploys/crawler-frontier.yaml
Auto-merging deploys/cohnwolfe.yaml
CONFLICT (content): Merge conflict in deploys/cohnwolfe.yaml
Auto-merging deploys/chuchu.yaml
CONFLICT (content): Merge conflict in deploys/chuchu.yaml
Auto-merging deploys/cdn.yaml
CONFLICT (content): Merge conflict in deploys/cdn.yaml
Auto-merging deploys/cdn-governo-brasileiro.yaml
CONFLICT (content): Merge conflict in deploys/cdn-governo-brasileiro.yaml
Auto-merging deploys/brmalls.yaml
CONFLICT (content): Merge conflict in deploys/brmalls.yaml
Auto-merging deploys/boxnet.yaml
CONFLICT (content): Merge conflict in deploys/boxnet.yaml
Auto-merging deploys/bmg.yaml
CONFLICT (content): Merge conflict in deploys/bmg.yaml
Auto-merging deploys/agideal.yaml
CONFLICT (content): Merge conflict in deploys/agideal.yaml
Automatic merge failed; fix conflicts and then commit the result.
[gio@archlinux helm]$