darwinia-network / shadow

Darwinia ZK proof services
GNU General Public License v3.0
2 stars 1 forks source link

error: Failed to merge in the changes. (when upgrading dargo using brew) #13

Closed hackfisher closed 4 years ago

hackfisher commented 4 years ago
MacBookPro:~ denny$ brew install dargo
Updating Homebrew...
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
f==> Auto-updated Homebrew!
Updated 3 taps (homebrew/core, darwinia-network/darwinia and ethereum/ethereum).
==> New Formulae
claws-mail          duktape             earthly             fargatecli          guile@2             kamel               kumactl             openfast            redo                vlmcsd
==> Updated Formulae
darwinia-network/darwinia/dargo ✔        dnstwist                                 kibana                                   openconnect                              sonarqube-lts
ethereum/ethereum/solidity ✔             docutils                                 kind                                     openimageio                              spoof-mac
gradle ✔                                 dolt                                     kops                                     osc                                      sqlmap
node ✔                                   dosbox-x                                 kubectx                                  osmosis                                  ssh-audit
redis ✔                                  duck                                     ledger                                   osquery                                  sslyze
sphinx-doc ✔                             dxpy                                     libfabric                                otf2                                     stellar-core
wxmac ✔                                  easyrpg-player                           libgr                                    packer                                   step
abcmidi                                  efl                                      liblcf                                   paket                                    subliminal
ace                                      ejabberd                                 libmypaint                               passpie                                  supervisor
acpica                                   ejdb                                     libsass                                  pastebinit                               swagger-codegen@2
adios2                                   elasticsearch                            libvirt                                  pdftk-java                               swift
algol68g                                 emscripten                               libwebsockets                            peru                                     swiftformat
alot                                     exploitdb                                libzt                                    phpstan                                  syncthing
angular-cli                              faas-cli                                 liquidctl                                phpunit                                  tarsnapper
ansible@2.8                              faudio                                   liquigraph                               pidgin                                   teensy_loader_cli
asciidoctorj                             fb-client                                livestreamer                             pius                                     tektoncd-cli
asio                                     fibjs                                    llnode                                   pnpm                                     termius
ask-cli                                  filebeat                                 lmdb                                     ponysay                                  termtosvg
astrometry-net                           flow                                     luaradio                                 pre-commit                               terragrunt
audacious                                fluent-bit                               lv                                       prestosql                                theharvester
autogen                                  flyway                                   makeself                                 procs                                    tmux
aws-cdk                                  fn                                       maxwell                                  proj                                     tmuxinator
aws-elasticbeanstalk                     folly                                    mdk                                      prometheus                               tmuxinator-completion
azcopy                                   fonttools                                mednafen                                 pueue                                    tomcat-native
azure-cli                                freetds                                  mercurial                                pulumi                                   tox
babel                                    futhark                                  mesa                                     pyinstaller                              traefik
balena-cli                               fwup                                     meson                                    pyside                                   trezor-agent
ballerina                                gatsby-cli                               meson-internal                           python-markdown                          tvnamer
bandwhich                                gdal                                     minio                                    qmmp                                     uhd
bde                                      gegl                                     mkvtomp4                                 quazip                                   unoconv
blackbox                                 gimme                                    mkvtoolnix                               questdb                                  urh
blitz                                    git-annex                                mlpack                                   quickjs                                  vault
bluepill                                 git-quick-stats                          molecule                                 rancher-cli                              vdirsyncer
caddy                                    github-release                           monero                                   rargs                                    verilator
cargo-c                                  glib-openssl                             mps-youtube                              re-flex                                  vim
certbot                                  glslang                                  mu                                       re2                                      vit
cfengine                                 golang-migrate                           mupdf                                    rebar3                                   vulkan-headers
cfn-lint                                 googler                                  mupdf-tools                              recon-ng                                 wabt
cglm                                     gopass                                   mutt                                     redex                                    wallpaper
charm-tools                              goreleaser                               mypy                                     restview                                 watchman
chronograf                               gotop                                    nagios                                   rke                                      webarchiver
clamav                                   gpgme                                    ncmpc                                    rswift                                   weboob
clang-format                             graphviz                                 nef                                      s3ql                                     weechat
clib                                     gromacs                                  neomutt                                  salt                                     whatmp3
cmark                                    groonga                                  nicovideo-dl                             scamper                                  wordgrinder
cmark-gfm                                grsync                                   nift                                     scrcpy                                   wpscan
composer                                 gsettings-desktop-schemas                node-build                               sd                                       wtf
conserver                                gsoap                                    notmuch                                  seal                                     xapian
contentful-cli                           gtk+3                                    nrpe                                     sec                                      xonsh
coturn                                   guile                                    nss                                      serverless                               yaegi
crc                                      helm@2                                   numpy                                    shfmt                                    yle-dl
ctemplate                                hlint                                    nyx                                      shyaml                                   yosys
curl                                     hugo                                     ocrmypdf                                 simgrid                                  youtube-dl
curl-openssl                             ipython                                  oha                                      simple-scan                              z
darcs                                    ircd-hybrid                              okteto                                   skaffold                                 zabbix
davix                                    ispc                                     oniguruma                                snakemake                                znc
deno                                     jenkins                                  open-babel                               snapcraft
dhall-bash                               jflex                                    open-image-denoise                       softhsm
django-completion                        kerl                                     openapi-generator                        sonarqube
==> Deleted Formulae
deis                                                                                                    deisctl
^R

Error: dargo: /usr/local/Homebrew/Library/Taps/darwinia-network/homebrew-darwinia/dargo.rb:7: syntax error, unexpected <<, expecting end
<<<<<<< HEAD
^~
/usr/local/Homebrew/Library/Taps/darwinia-network/homebrew-darwinia/dargo.rb:10: syntax error, unexpected ===, expecting end
=======
^~~
/usr/local/Homebrew/Library/Taps/darwinia-network/homebrew-darwinia/dargo.rb:13: syntax error, unexpected >>, expecting end
>>>>>>> The Missing Packages fo...
^~
/usr/local/Homebrew/Library/Taps/darwinia-network/homebrew-darwinia/dargo.rb:13: syntax error, unexpected tIDENTIFIER, expecting do or '{' or '('
...ing Packages for Darwinia macOS Users
...
clearloop commented 4 years ago

dargo v0.1.2 is uploading now


To fix this kind of errors, you can

brew untap darwinia-network/darwinia
brew tap darwinia-network/darwinia

This is casued by some force push stuffs last times...because homebrew-darwinia only has 1 commit at that time...

hackfisher commented 4 years ago
brew untap darwinia-network/darwinia
brew tap darwinia-network/darwinia
brew install dargo
brew upgrade darwinia-network/darwinia/dargo

Fixed this, caused by some git force push operations.