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 an email with
"unsubscribe kernelnewbies" to ecartis@xxxxxxxxxxxx
Please read the FAQ at http://kernelnewbies.org/FAQ


[Index of Archives]     [Newbies FAQ]     [Linux Kernel Mentors]     [Linux Kernel Development]     [IETF Annouce]     [Git]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux SCSI]     [Linux ACPI]
  Powered by Linux