From: Phil Auld on
gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177#note_6145...
Anyone with better git-fu know how to rebase this single commit? I tried git
fetch origin; git rebase origin/os-build from my branch but that failed badly
with conflicts on .gitingore and .gitattributes on the initial redhat commit.