daily pastebin goal
15%
SHARE
TWEET

Untitled

a guest Dec 13th, 2018 57 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. [gio@archlinux helm]$ git checkout master
  2. Switched to branch 'master'
  3. Your branch and 'origin/master' have diverged,
  4. and have 1 and 27 different commits each, respectively.
  5.   (use "git pull" to merge the remote branch into yours)
  6. [gio@archlinux helm]$ git branch        
  7.   anomalias
  8. * master
  9.   recursos
  10.   resources-control
  11. [gio@archlinux helm]$ git pull
  12. remote: Enumerating objects: 76, done.
  13. remote: Counting objects: 100% (76/76), done.
  14. remote: Compressing objects: 100% (47/47), done.
  15. remote: Total 76 (delta 62), reused 35 (delta 29)
  16. Unpacking objects: 100% (76/76), done.
  17. From gitlab.stilingue.com.br:Kubernetes/helm
  18.    28a44c9..79f11bf  master            -> origin/master
  19.    212257a..2dd70d3  resources-control -> origin/resources-control
  20. Auto-merging deploys/santafe.yaml
  21. CONFLICT (content): Merge conflict in deploys/santafe.yaml
  22. Auto-merging deploys/psd.yaml
  23. CONFLICT (content): Merge conflict in deploys/psd.yaml
  24. Auto-merging deploys/prefeitura-rio.yaml
  25. CONFLICT (content): Merge conflict in deploys/prefeitura-rio.yaml
  26. Auto-merging deploys/performance-realtime.yaml
  27. Auto-merging deploys/omelete-ccxp.yaml
  28. CONFLICT (content): Merge conflict in deploys/omelete-ccxp.yaml
  29. Auto-merging deploys/novo-discurso.yaml
  30. CONFLICT (content): Merge conflict in deploys/novo-discurso.yaml
  31. Auto-merging deploys/nobullshit.yaml
  32. CONFLICT (content): Merge conflict in deploys/nobullshit.yaml
  33. Auto-merging deploys/naturacosmeticos.yaml
  34. CONFLICT (content): Merge conflict in deploys/naturacosmeticos.yaml
  35. Auto-merging deploys/leiaute.yaml
  36. CONFLICT (content): Merge conflict in deploys/leiaute.yaml
  37. Auto-merging deploys/itau.yaml
  38. CONFLICT (content): Merge conflict in deploys/itau.yaml
  39. Auto-merging deploys/inpress.yaml
  40. CONFLICT (content): Merge conflict in deploys/inpress.yaml
  41. Auto-merging deploys/hydro.yaml
  42. CONFLICT (content): Merge conflict in deploys/hydro.yaml
  43. Auto-merging deploys/fsb.yaml
  44. CONFLICT (content): Merge conflict in deploys/fsb.yaml
  45. Auto-merging deploys/first.yaml
  46. CONFLICT (content): Merge conflict in deploys/first.yaml
  47. Auto-merging deploys/first-dedicado.yaml
  48. CONFLICT (content): Merge conflict in deploys/first-dedicado.yaml
  49. Auto-merging deploys/first-dedicado-twitter.yaml
  50. CONFLICT (content): Merge conflict in deploys/first-dedicado-twitter.yaml
  51. Auto-merging deploys/first-dedicado-blogs.yaml
  52. CONFLICT (content): Merge conflict in deploys/first-dedicado-blogs.yaml
  53. Auto-merging deploys/fetcher-api.yaml
  54. Auto-merging deploys/febraban.yaml
  55. CONFLICT (content): Merge conflict in deploys/febraban.yaml
  56. Auto-merging deploys/fbiz.yaml
  57. CONFLICT (content): Merge conflict in deploys/fbiz.yaml
  58. Auto-merging deploys/dpzt.yaml
  59. CONFLICT (content): Merge conflict in deploys/dpzt.yaml
  60. Auto-merging deploys/doria.yaml
  61. CONFLICT (content): Merge conflict in deploys/doria.yaml
  62. Auto-merging deploys/crawler-frontier.yaml
  63. Auto-merging deploys/cohnwolfe.yaml
  64. CONFLICT (content): Merge conflict in deploys/cohnwolfe.yaml
  65. Auto-merging deploys/chuchu.yaml
  66. CONFLICT (content): Merge conflict in deploys/chuchu.yaml
  67. Auto-merging deploys/cdn.yaml
  68. CONFLICT (content): Merge conflict in deploys/cdn.yaml
  69. Auto-merging deploys/cdn-governo-brasileiro.yaml
  70. CONFLICT (content): Merge conflict in deploys/cdn-governo-brasileiro.yaml
  71. Auto-merging deploys/brmalls.yaml
  72. CONFLICT (content): Merge conflict in deploys/brmalls.yaml
  73. Auto-merging deploys/boxnet.yaml
  74. CONFLICT (content): Merge conflict in deploys/boxnet.yaml
  75. Auto-merging deploys/bmg.yaml
  76. CONFLICT (content): Merge conflict in deploys/bmg.yaml
  77. Auto-merging deploys/agideal.yaml
  78. CONFLICT (content): Merge conflict in deploys/agideal.yaml
  79. Automatic merge failed; fix conflicts and then commit the result.
  80. [gio@archlinux helm]$
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top