On Fri, Jul 21, 2017 at 05:46:44AM -0700, Jon Erickson wrote: > > To start, the user that generated this error was advised to backout the > > resulting munge and use a standard merge to fix his problems. Following > > standard merging practices fixed his problems but his original approach had > > been nagging at me. This user was using git pull to merge from master to > > his personal development branch. Here are the steps he was performing > > and the resulting pop: > > > > git checkout -b ticket/1976 origin/master > > > > git commit -m 'As requested, renamed files to reflect their type.' > > > > git commit -m 'Added convenience alias for commands.' > > > > git commit -m 'Modifications to support "use PAW" Banner display.' > > > > git pull origin master > > > > got the following: > > > > error: merge died of signal 11 (SEGV) plus a core file > > > Could SEGV mean segmentation fault i.e. out of memory error or am I way > off base?
That's exactly what it means. But to be honest, SIGSEGV seldom, if ever, means an out-of-memory error, except when there's a bug in the software so when the C's malloc() returns NULL -- it does to in the case of out-of-memory, -- that value is not checked for being valid and is used right away. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
