From: Thorsten Leemhuis on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/commit/691f37398b27a8a10853eb989dbbf92df51522a9#note_527756709
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... _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
