I made some changes to .gitignore so that untracked files were formed in the repo. When I tried a pull, it failed:
[[email protected]] ~/kernel/kernel_android_n7100_v1 $git pull origin Updating df5f8a1..d6f61da error: The following untracked working tree files would be overwritten by merge: include/config/accessory.h include/config/aeabi.h include/config/alignment/trap.h include/config/android.h
So the solution was to do a:
git fetch --all git reset --hard origin/master
[[email protected]] ~/kernel/kernel_android_n7100_v1 $git fetch --all Fetching origin [[email protected]] ~/kernel/kernel_android_n7100_v1 $git reset --hard origin/master HEAD is now at d6f61da More missing files added
Joel G Mathew, known in tech circles by the pseudonym Droidzone, is an opensource and programming enthusiast.
He is a full stack developer, whose favorite languages are currently Python and Vue.js. He is also fluent in Javascript, Flutter/Dart, Perl, PHP, SQL, C and bash shell scripting. He loves Linux, and can often be found tinkering with linux kernel code, and source code for GNU applications. He used to be an active developer on XDA forums, and his tinkered ROMS used to be very popular in the early 2000s.
His favorite pastime is grappling with GNU compilers, discovering newer Linux secrets, writing scripts, hacking roms, and programs (nothing illegal), reading, blogging. and testing out the latest gadgets.
When away from the tech world, Dr Joel G. Mathew is a practising ENT Surgeon, busy with surgeries and clinical practise.