u-boot-builder can generate a "full-boot-image" that contains an m4.img and an imx u-boot.
Step 1. Fetch and check out the branch for this merge request
git fetch "https://source.puri.sm/angus.ainslie/librem5-devkit-tools.git" "full-boot-image" git checkout -b "angus.ainslie/librem5-devkit-tools-full-boot-image" FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "origin/master" git merge --no-ff "angus.ainslie/librem5-devkit-tools-full-boot-image"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.