I have a local Linux kernel repository that tracks git@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?
I’ll copy the group next time it occurs [as the last update I handled through lazy cloning and then added my patches].
I guess Robert Nelson can answer as it must be related to the way he copies his private kernel repository changes to the Beagleboard public.
Here are his latest two commit messages.
Can you (somehow) make it easier to follow the public Beagleboard kernel via the usual git-pull and git-rebase processes [to enter one’s local commits] . Your work is greatly appreciated. The vanilla Linux-stable kernel is simply inadequate to take advantage of the full Beagleboard hardware.
Is there a published recipe explaining how you do this amalgamation?
git fetch beagleboard
git rebase --onto 4.14.71-ti-r79 4.14.71-ti-r78 my-branch
where "beagleboard" is the git remote for https://github.com/beagleboard/linux.git, "4.14.71-ti-r79" is the new tag I am rebasing onto, "4.14.71-ti-r78" is the previous tag my branch was based on and "my-branch" is the name of the local branch I want to rebase.