Merge with strategy recursive failed errors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I got stuck here:

/mnt/hd0/download/linux_sched/linux-2.6-sched-devel>git checkout -f

/mnt/hd0/download/linux_sched/linux-2.6-sched-devel>git pull
fatal: Untracked working tree file
'Documentation/ABI/stable/sysfs-class-ubi' would be overwritten by
merge.
Merge with strategy recursive failed.

Can someone help ?

-- 
Regards,
Peter Teoh
--
To unsubscribe from this list: send the line "unsubscribe kernel-testers" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux