Date: Wed, 22 May 2024 11:49:57 -0700 From: bob prohaska <fbsd@www.zefox.net> To: freebsd-arm@freebsd.org Cc: bob prohaska <fbsd@www.zefox.net> Subject: error: merge died of signal 1115) Message-ID: <Zk4-VTxBnRMz4IlA@www.zefox.net>
next in thread | raw e-mail | index | archive | help
[aside, the trailing ) in the subject isn't a typo] A Pi2 v1.1 running FreeBSD www.zefox.com 14.0-RELEASE-p6 FreeBSD 14.0-RELEASE-p6 #51 +releng/14.0-n265417-d338712beb16: Sat Apr 6 23:48:20 PDT 2024 +bob@www.zefox.com:/usr/obj/usr/src/arm.armv7/sys/GENERIC arm reported error: merge died of signal 1115) while running git pull. Any ideas what it means? Re-running git pull elicted: error: Unable to create '/usr/src/.git/index.lock': File exists. Deleting the errant lock file has resulted in error: Your local changes to the following files would be overwritten by merge: ....[long list of files] Perhaps more important, how does one recover? So far attempts at git reset didn't help. There are no local changes to preserve, but re-cloning is a slow and sometimes difficult process. Thanks for reading, and any guidance! bob prohaska
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Zk4-VTxBnRMz4IlA>