BENTZ Sylvain wrote: > I've stumbled on a segmentation fault while resolving merge conflicts. > Basically, I missed to remove some conflict markers, tried to commit the > (faulty) merge resolution, and Git mishandles that. > > The original issue happened applying a patch using 3-way merge. The minimal > working example below creates a conflict with a simple `git merge` command. A quick workaround: git config --global rerere.enabled false But yeah, there seems to be a bug in `git rerere`. -- Felipe Contreras
