Hi, Have been using rerere successfully for a short while, but have run into an issue whereby when merging a branch with 14 conflicts, rerere only pre-records images for 6 of them. All the files are different, although the conflicted areas are identical. Does anyone have any clues what might be the issue or even a solution?
oot@steady /home/andy/git/startup: (test)$ git merge us68-tmem-from-hap3 Auto-merging codebase/diskimgs/vm-configuration/ztestvm3/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/ztestvm3/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/ztestvm2/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/ztestvm2/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/ztestvm1/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/ztestvm1/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zpatchmgr/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zpatchmgr/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/znetdd/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/znetdd/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zmonitor/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zmonitor/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zlogger/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zlogger/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zhapui/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zhapui/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zhapcon/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zhapcon/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zdiskdd/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zdiskdd/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zcloud/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zcloud/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zbkstore/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zbkstore/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/zbkmgr/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/zbkmgr/vmconfig.tpl Auto-merging codebase/diskimgs/vm-configuration/GenericBase/vmconfig.tpl CONFLICT (content): Merge conflict in codebase/diskimgs/vm-configuration/GenericBase/vmconfig.tpl Recorded preimage for 'codebase/diskimgs/vm-configuration/GenericBase/vmconfig.tpl' Recorded preimage for 'codebase/diskimgs/vm-configuration/zbkmgr/vmconfig.tpl' Recorded preimage for 'codebase/diskimgs/vm-configuration/zcloud/vmconfig.tpl' Recorded preimage for 'codebase/diskimgs/vm-configuration/zdiskdd/vmconfig.tpl' Recorded preimage for 'codebase/diskimgs/vm-configuration/zhapcon/vmconfig.tpl' Recorded preimage for 'codebase/diskimgs/vm-configuration/znetdd/vmconfig.tpl' Automatic merge failed; fix conflicts and then commit the result. Thanks, Andy -- 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/groups/opt_out.
