Re: git rerere is confused with identical conflicts in multiple files

2015-07-10 Thread Markos Chandras
Hi, On 07/10/2015 03:13 PM, Junio C Hamano wrote: > Markos Chandras writes: > >> $ cat .git/MERGE_RR >> 5563edc0fb427275a0ca5677c93c40def8b53258 >> arch/mips/include/asm/cpu-type.hf175ff6228f624296b661664bce4ab4e84d712cc >> >> arch/mips/include/asm/cpu.h5563edc0fb427275a0ca5677c93c40def8b53258 >

Re: git rerere is confused with identical conflicts in multiple files

2015-07-10 Thread Junio C Hamano
Markos Chandras writes: > $ cat .git/MERGE_RR > 5563edc0fb427275a0ca5677c93c40def8b53258 > arch/mips/include/asm/cpu-type.hf175ff6228f624296b661664bce4ab4e84d712cc > > arch/mips/include/asm/cpu.h5563edc0fb427275a0ca5677c93c40def8b53258 >arch/mips/kernel/idle.c5563edc0fb427275a0ca5677c93c40def

git rerere is confused with identical conflicts in multiple files

2015-07-10 Thread Markos Chandras
Hi, (Please keep me on CC as I am not subscribed to the list) I am having a weird problem when merging a branch which causes some conflicts This is the initial status for the rerere cache $ tree .git/rr-cache .git/rr-cache [error opening dir] 0 directories, 0 files I then go ahead and merge