On Thursday, July 20, 2017 at 7:11:03 PM UTC-4, 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? >
> I know that pull does a fetch followed by a merge but is there anything > special about that merge that could explain the failure? Does pull > assume that the branch your working on and the remote branch have the same > lineage? I am really just interested in finding out if pulls merge is > different from a standard merge and if so how. If it isn’t, then perhaps > this is a bug, albeit a bug that you really should never see using standard > merge practices. > -- 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.
