Geth 1.1.0 upgrade error

DaveHDaveH Member Posts: 42
edited August 2015 in Geth - Go Implementation
During the week I attempted to upgrade to Geth 1.1.0 and experienced and error which I'm not familiar with.

Specs/Info
OS - Ubuntu 14.04.2
Mining following http://spacience.blogspot.co.uk/2015/05/ethereum-gpu-mining-ubuntu-1404-lts.html
Git branch - Master
Geth version prior to attempted upgrade: 1.0.2
Go ver: 1.4.2

In summary, I ran 'git pull' and it asked me to update my name and email address, which I had never happened before and I was not expecting but did.

Then I ran git pull again and I appear to get 'conflicts'? The final error message being:

Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm '
as appropriate to mark resolution, or use 'git commit -a'.

Can I just delete geth and re-install? If so, how do I do that and is there anything I need to back up first?

Any and all help or suggestions as to what I need to do to solve this would be much appreciated (full extract from terminal below):


[email protected]:~/go-ethereum$ git pull

*** Please tell me who you are.

Run

git config --global user.email "[email protected]"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got '[email protected](none)')
[email protected]:~/go-ethereum$ git config --global user.email "[my email redacted]"
[email protected]:~/go-ethereum$ git config --global user.name "[my name redacted]"
[email protected]:~/go-ethereum$ git pull
Auto-merging xeth/xeth.go
CONFLICT (content): Merge conflict in xeth/xeth.go
Auto-merging tests/block_test_util.go
Auto-merging rpc/useragent/agent.go
Removing jsre/pp_js.go
Removing fdtrack/fdusage_darwin.go
Removing fdtrack/fdtrack.go
Removing crypto/mnemonic_words.go
Removing crypto/mnemonic_test.go
Removing crypto/mnemonic.go
Removing crypto/keypair.go
Auto-merging core/vm/settings.go
Removing common/path_test.go
Auto-merging cmd/geth/main.go
CONFLICT (content): Merge conflict in cmd/geth/main.go
Removing Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_windows.go
Removing Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_others.go
Removing Godeps/_workspace/src/github.com/mattn/go-colorable/README.md
Automatic merge failed; fix conflicts and then commit the result.
[email protected]:~/go-ethereum$ make geth
build/env.sh go install -v -ldflags '-X main.gitCommit a0303ff4bdc17fba10baea4ce9ff250e5923efa2' ./cmd/geth
github.com/ethereum/go-ethereum/rlp
github.com/shiena/ansicolor
github.com/fatih/color
github.com/ethereum/go-ethereum/common
github.com/ethereum/go-ethereum/crypto
github.com/ethereum/go-ethereum/logger
github.com/ethereum/go-ethereum/jsre
github.com/ethereum/go-ethereum/metrics
github.com/ethereum/go-ethereum/p2p/nat
github.com/ethereum/go-ethereum/rpc/shared
github.com/ethereum/go-ethereum/ethdb
github.com/ethereum/go-ethereum/rpc/codec
github.com/ethereum/go-ethereum/accounts
github.com/ethereum/go-ethereum/common/compiler
github.com/ethereum/go-ethereum/p2p/discover
github.com/ethereum/go-ethereum/common/docserver
github.com/ethereum/go-ethereum/trie
github.com/ethereum/go-ethereum/common/registrar
github.com/ethereum/go-ethereum/rpc/useragent
github.com/ethereum/go-ethereum/rpc/comms
github.com/ethereum/go-ethereum/core/state
github.com/ethereum/go-ethereum/p2p
github.com/ethereum/go-ethereum/core/types
github.com/ethereum/go-ethereum/core/vm
github.com/ethereum/go-ethereum/pow
github.com/ethereum/ethash
github.com/ethereum/go-ethereum/core
github.com/ethereum/go-ethereum/eth/downloader
github.com/ethereum/go-ethereum/eth/fetcher
github.com/ethereum/go-ethereum/event/filter
github.com/ethereum/go-ethereum/whisper
github.com/ethereum/go-ethereum/miner
github.com/ethereum/go-ethereum/eth
github.com/ethereum/go-ethereum/xeth
github.com/ethereum/go-ethereum/tests
# github.com/ethereum/go-ethereum/xeth
xeth/xeth.go:891: syntax error: unexpected <<
make: *** [geth] Error 2
[email protected]:~/go-ethereum$ git pull
A .gitattributes
M .travis.yml
A CONTRIBUTING.md
M Godeps/Godeps.json
A Godeps/_workspace/src/github.com/fatih/color/.travis.yml
A Godeps/_workspace/src/github.com/fatih/color/LICENSE.md
A Godeps/_workspace/src/github.com/fatih/color/README.md
A Godeps/_workspace/src/github.com/fatih/color/color.go
A Godeps/_workspace/src/github.com/fatih/color/color_test.go
A Godeps/_workspace/src/github.com/fatih/color/doc.go
M Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go
M Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go
M Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go
D Godeps/_workspace/src/github.com/mattn/go-colorable/README.md
D Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_others.go
D Godeps/_workspace/src/github.com/mattn/go-colorable/colorable_windows.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/.gitignore
A Godeps/_workspace/src/github.com/shiena/ansicolor/LICENSE
A Godeps/_workspace/src/github.com/shiena/ansicolor/README.md
A Godeps/_workspace/src/github.com/shiena/ansicolor/ansicolor.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/ansicolor/main.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/ansicolor_ansi.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/ansicolor_test.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/ansicolor_windows.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/ansicolor_windows_test.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/example_test.go
A Godeps/_workspace/src/github.com/shiena/ansicolor/export_test.go
M Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
M Makefile
M README.md
M build/test-global-coverage.sh
M cmd/ethtest/main.go
M cmd/evm/main.go
M cmd/geth/chaincmd.go
M cmd/geth/js.go
U cmd/geth/main.go
M cmd/utils/cmd.go
M cmd/utils/customflags.go
M cmd/utils/customflags_test.go
M cmd/utils/flags.go
M common/compiler/solidity_test.go
M common/docserver/docserver.go
M common/docserver/docserver_test.go
M common/path.go
D common/path_test.go
M common/size_test.go
M core/bench_test.go
M core/block_processor.go
M core/block_processor_test.go
M core/chain_makers.go
M core/chain_makers_test.go
M core/chain_manager.go
M core/chain_manager_test.go
M core/chain_util.go
M core/error.go
M core/execution.go
M core/filter.go
M core/genesis.go
M core/manager.go
M core/types/block.go
M core/types/block_test.go
M core/vm/context.go
M core/vm/contracts.go
M core/vm/environment.go
M core/vm/gas.go
A core/vm/instructions.go
A core/vm/jit.go
A core/vm/jit_test.go
A core/vm/settings.go
M core/vm/stack.go
M core/vm/vm.go
M core/vm_env.go
D crypto/keypair.go
D crypto/mnemonic.go
D crypto/mnemonic_test.go
D crypto/mnemonic_words.go
M eth/backend.go
M eth/gasprice.go
M eth/handler.go
M eth/protocol_test.go
M ethdb/database.go
D fdtrack/fdtrack.go
D fdtrack/fdusage.go
D fdtrack/fdusage_darwin.go
D fdtrack/fdusage_linux.go
M jsre/ethereum_js.go
M jsre/jsre.go
M jsre/jsre_test.go
D jsre/pp_js.go
A jsre/pretty.go
M miner/miner.go
M miner/remote_agent.go
M miner/worker.go
M p2p/dial.go
M p2p/discover/node.go
M p2p/discover/table.go
M p2p/discover/table_test.go
M p2p/discover/udp.go
M p2p/discover/udp_test.go
M p2p/metrics.go
M p2p/nat/natupnp_test.go
M p2p/peer_error.go
M p2p/rlpx.go
M p2p/server.go
M rlp/decode.go
M rlp/decode_test.go
M rlp/encode.go
M rlp/encode_test.go
M rpc/api/admin.go
M rpc/api/debug.go
M rpc/api/eth.go
M rpc/api/eth_args.go
M rpc/api/miner.go
M rpc/api/net.go
M rpc/api/personal.go
M rpc/api/personal_args.go
A rpc/api/shh_js.go
D rpc/api/ssh_js.go
M rpc/codec/codec.go
M rpc/codec/json.go
M rpc/comms/comms.go
M rpc/comms/http.go
M rpc/comms/inproc.go
M rpc/comms/ipc.go
M rpc/comms/ipc_unix.go
M rpc/comms/ipc_windows.go
M rpc/jeth.go
A rpc/useragent/agent.go
A rpc/useragent/remote_frontend.go
M rpc/xeth.go
M tests/block_test.go
M tests/block_test_util.go
M tests/files/BlockchainTests/bcUncleTest.json
M tests/state_test.go
M tests/state_test_util.go
M tests/util.go
M tests/vm_test.go
M tests/vm_test_util.go
M trie/cache.go
M trie/encoding.go
M trie/encoding_test.go
M trie/iterator.go
M trie/shortnode.go
M trie/trie.go
M xeth/state.go
M xeth/types.go
U xeth/xeth.go
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.



Post edited by DaveH on

Best Answers

Answers

Sign In or Register to comment.