error pulling from the Beta git repo

I'm using the beta git repo at , and I have been compiling source in that
directory. Today, when I ran "git pull", it errored out instead of updating
fully. I don't know if the error was a result of me building in the
directory, but it seems like a reasonable possibility. It was never an
issue with SVN, but should I build the source in a separate directory to
avoid problems with git? I don't know if git keeps a log that I can check
for the full output. If it does, I'd check if I knew the location. As it
is, I only have the partial output still present in my terminal window.
Following is the last portion of the output if it helps to identify the
error and its cause:

Auto-merging crypto/openssl/crypto/x509v3/v3_purp.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/x509v3/v3_purp.c
CONFLICT (rename/delete): crypto/x509/x_pubkey.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/x509/x_pubkey.c in HEAD. Version HEAD of
crypto/openssl/crypto/x509/x_pubkey.c left in tree.
Auto-merging crypto/openssl/crypto/x509/x509_vfy.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/x509/x509_vfy.c
CONFLICT (rename/delete): crypto/x509/x509_local.h deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/x509/x509_local.h in HEAD. Version HEAD of
crypto/openssl/crypto/x509/x509_local.h left in tree.
CONFLICT (rename/delete): crypto/whrlpool/wp_block.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/whrlpool/wp_block.c in HEAD. Version HEAD of
crypto/openssl/crypto/whrlpool/wp_block.c left in tree.
Auto-merging crypto/openssl/crypto/ui/ui_openssl.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/ui/ui_openssl.c
CONFLICT (rename/delete): crypto/ts/ts_rsp_sign.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/ts/ts_rsp_sign.c in HEAD. Version HEAD of
crypto/openssl/crypto/ts/ts_rsp_sign.c left in tree.
CONFLICT (rename/delete): crypto/store/store_lib.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/store/store_lib.c in HEAD. Version HEAD of
crypto/openssl/crypto/store/store_lib.c left in tree.
CONFLICT (rename/delete): crypto/store/loader_file.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/store/loader_file.c in HEAD. Version HEAD of
crypto/openssl/crypto/store/loader_file.c left in tree.
CONFLICT (rename/delete): crypto/rsa/rsa_ameth.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/rsa/rsa_ameth.c in HEAD. Version HEAD of
crypto/openssl/crypto/rsa/rsa_ameth.c left in tree.
CONFLICT (rename/delete): crypto/rand/rand_local.h deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/rand/rand_local.h in HEAD. Version HEAD of
crypto/openssl/crypto/rand/rand_local.h left in tree.
CONFLICT (rename/delete): crypto/rand/drbg_lib.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/rand/drbg_lib.c in HEAD. Version HEAD of
crypto/openssl/crypto/rand/drbg_lib.c left in tree.
CONFLICT (rename/delete): crypto/rand/drbg_ctr.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/rand/drbg_ctr.c in HEAD. Version HEAD of
crypto/openssl/crypto/rand/drbg_ctr.c left in tree.
CONFLICT (add/add): Merge conflict in crypto/openssl/crypto/pem/pvkfmt.c
Auto-merging crypto/openssl/crypto/pem/pvkfmt.c
Auto-merging crypto/openssl/crypto/pem/pem_pkey.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/pem/pem_pkey.c
Auto-merging crypto/openssl/crypto/pem/pem_lib.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/pem/pem_lib.c
Auto-merging crypto/openssl/crypto/o_time.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/o_time.c
CONFLICT (rename/delete): crypto/modes/xts128.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/xts128.c in HEAD. Version HEAD of
crypto/openssl/crypto/modes/xts128.c left in tree.
CONFLICT (rename/delete): crypto/modes/ofb128.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/ofb128.c in HEAD. Version HEAD of
crypto/openssl/crypto/modes/ofb128.c left in tree.
CONFLICT (rename/delete): crypto/modes/modes_local.h deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/modes_local.h in HEAD. Version HEAD of
crypto/openssl/crypto/modes/modes_local.h left in tree.
CONFLICT (rename/delete): crypto/modes/gcm128.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/gcm128.c in HEAD. Version HEAD of
crypto/openssl/crypto/modes/gcm128.c left in tree.
CONFLICT (rename/delete): crypto/modes/ctr128.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/ctr128.c in HEAD. Version HEAD of
crypto/openssl/crypto/modes/ctr128.c left in tree.
CONFLICT (rename/delete): crypto/modes/cfb128.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/cfb128.c in HEAD. Version HEAD of
crypto/openssl/crypto/modes/cfb128.c left in tree.
CONFLICT (rename/delete): crypto/modes/ccm128.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/ccm128.c in HEAD. Version HEAD of
crypto/openssl/crypto/modes/ccm128.c left in tree.
CONFLICT (rename/delete): crypto/modes/cbc128.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/modes/cbc128.c in HEAD. Version HEAD of
crypto/openssl/crypto/modes/cbc128.c left in tree.
CONFLICT (rename/delete): crypto/mem_sec.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/mem_sec.c in HEAD. Version HEAD of
crypto/openssl/crypto/mem_sec.c left in tree.
CONFLICT (rename/delete): crypto/err/openssl.txt deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/err/openssl.txt in HEAD. Version HEAD of
crypto/openssl/crypto/err/openssl.txt left in tree.
Auto-merging crypto/openssl/crypto/engine/eng_lib.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/engine/eng_lib.c
CONFLICT (add/add): Merge conflict in
crypto/openssl/crypto/ec/ecp_nistz256.c
Auto-merging crypto/openssl/crypto/ec/ecp_nistz256.c
CONFLICT (rename/delete): crypto/ec/ecp_nistp521.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/ec/ecp_nistp521.c in HEAD. Version HEAD of
crypto/openssl/crypto/ec/ecp_nistp521.c left in tree.
CONFLICT (rename/delete): crypto/ec/ecp_nistp224.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/ec/ecp_nistp224.c in HEAD. Version HEAD of
crypto/openssl/crypto/ec/ecp_nistp224.c left in tree.
CONFLICT (rename/delete): crypto/ec/ec_local.h deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/ec/ec_local.h in HEAD. Version HEAD of
crypto/openssl/crypto/ec/ec_local.h left in tree.
Auto-merging crypto/openssl/crypto/ec/ec_lib.c
CONFLICT (add/add): Merge conflict in crypto/openssl/crypto/ec/ec_ameth.c
Auto-merging crypto/openssl/crypto/ec/ec_ameth.c
CONFLICT (rename/delete): crypto/ec/asm/ecp_nistz256-armv4.pl deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl in HEAD. Version HEAD of
crypto/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl left in tree.
CONFLICT (rename/delete): crypto/cmac/cmac.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/crypto/cmac/cmac.c in HEAD. Version HEAD of
crypto/openssl/crypto/cmac/cmac.c left in tree.
Auto-merging crypto/openssl/crypto/bn/bn_lib.c
CONFLICT (content): Merge conflict in crypto/openssl/crypto/bn/bn_lib.c
CONFLICT (add/add): Merge conflict in crypto/openssl/appveyor.yml
Auto-merging crypto/openssl/appveyor.yml
Auto-merging crypto/openssl/apps/s_client.c
CONFLICT (content): Merge conflict in crypto/openssl/apps/s_client.c
Auto-merging crypto/openssl/README
CONFLICT (content): Merge conflict in crypto/openssl/README
CONFLICT (rename/delete): NOTES.PERL deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
crypto/openssl/NOTES.PERL in HEAD. Version HEAD of
crypto/openssl/NOTES.PERL left in tree.
Auto-merging crypto/openssl/NEWS
CONFLICT (content): Merge conflict in crypto/openssl/NEWS
Auto-merging crypto/openssl/Configure
CONFLICT (content): Merge conflict in crypto/openssl/Configure
Auto-merging crypto/openssl/CHANGES
CONFLICT (content): Merge conflict in crypto/openssl/CHANGES
Auto-merging contrib/one-true-awk/lex.c
Auto-merging contrib/one-true-awk/b.c
Auto-merging contrib/one-true-awk/awk.h
CONFLICT (rename/delete): man/vi.1 deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
contrib/nvi/man/vi.1 in HEAD. Version HEAD of contrib/nvi/man/vi.1 left in
tree.
CONFLICT (add/add): Merge conflict in contrib/libexecinfo/unwind.c
Auto-merging contrib/libexecinfo/unwind.c
CONFLICT (rename/delete): warshall.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
contrib/byacc/warshall.c in HEAD. Version HEAD of contrib/byacc/warshall.c
left in tree.
CONFLICT (rename/delete): closure.c deleted in
2541f3df33872528e8bd003b97a78668119f812d and renamed to
contrib/byacc/closure.c in HEAD. Version HEAD of contrib/byacc/closure.c
left in tree.
Auto-merging bin/cp/Makefile
CONFLICT (content): Merge conflict in bin/cp/Makefile
Auto-merging ObsoleteFiles.inc
CONFLICT (content): Merge conflict in ObsoleteFiles.inc
Auto-merging Makefile.inc1
CONFLICT (content): Merge conflict in Makefile.inc1
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
CONFLICT (add/add): Merge conflict in .clang-format
Auto-merging .clang-format
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least
132108 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.