I am unfamiliar with how the repo. But it may be helpful to give an idea what sort of conflicts there are? Maybe in a gist?
--Luther On Friday, October 5, 2018 at 12:22:26 PM UTC+8, Enoch wrote: > > Hi Robert Nelson & Friends, > > I have a local Linux kernel repository that tracks > g...@github.com: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 beagleboard+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/beagleboard/119dedd3-21bc-436b-8f08-adef01714eaa%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
