From: Thorsten Leemhuis on
gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/commit/691f37398b27a8a10853eb...
I'm wondering: wouldn't it be a whole lot easier for downstream
maintainers that want to apply some local changes to this branch if
you'd
* omit this `git reset --hard master` here
* instead simply add a `git merge master; git commit -m "bulk merge ark-
infra as of $(date)"` after the `git archive... | tar -x` stuff?
There normally shouldn't be any conflicts, unless the one-line change to
Makefile leads to one, but that should rarely happen.
Or am I missing something here? I guess I am...