Julia 1.0.2, EMERGECONFLICT with pkg update

General Usage
1

This error started happening to me this morning. Does anyone have any ideas about how to fix it? Thanks.

           _

_ _ ()_ | Documentation: https://docs.julialang.org
() | () () |
_ _ | | __ _ | Type “?” for help, “]?” for Pkg help.
| | | | | | |/ ` | |
| | || | | | (| | | Version 1.0.3 (2018-12-18)
/ |_‘|||_’_| | FreeBSD ports lang/julia build
|__/ |

(v1.0) pkg> update
Updating registry at ~/.julia/registries/General
Updating git-repo https://github.com/JuliaRegistries/General.git
ERROR: GitError(Code:EMERGECONFLICT, Class:Checkout, 28 conflicts prevent checkout)
Stacktrace:
[1] macro expansion at /wrkdirs/usr/ports/lang/julia/work/julia-1.0.3/usr/share/julia/stdlib/v1.0/LibGit2/src/error.jl:101 [inlined]

2

This is not a fix for the root cause, but try deleting ~/.julia folder and repeat the process.