ostree: Set parent of merge commit to base commit if present#1600

cgwalters merged 1 commit intobootc-dev:mainbootc-dev/bootc:mainfrom

cgwalters:base-commitcgwalters/bootc:base-commitCopy head branch name to clipboard