I tried the steps here: https://gist.github.com/CristinaSolana/1885435, but I got an error when I did
git pull upstream odroidxu4-4.9.y:
Code: Select all
git clone email@example.com:mad-ady/linux.git cd linux/ git remote add upstream git://github.com/hardkernel/linux git fetch upstream git pull upstream odroidxu4-4.9.y ... Auto-merging Documentation/00-INDEX warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 32092 and retry the command. Automatic merge failed; fix conflicts and then commit the result.
Any ideas on what I should do?