Hi Robert Nelson & Friends,

I have a local Linux kernel repository that tracks 
[email protected]:beagleboard/linux.git
Each time this repository gets updated my git-pull creates numerous 
unmerged files to resolve by hand.
No other git project that I track (including linux-stable) behaves the same.
Can this be avoided?

Thanks, Enoch.

 

-- 
For more options, visit http://beagleboard.org/discuss
--- 
You received this message because you are subscribed to the Google Groups 
"BeagleBoard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/beagleboard/4154f609-dd57-4a37-b902-c96b23f6e5bf%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to