Skip to content

HOWTO: Merging Upstream Fixes

Jump to bottom
vintagepc edited this page Mar 5, 2025 · 1 revision

In order to keep the commit history clean and scoped to this project, upstream synchronizations happen via squash merges. Full commit history is retained in special merge branches.

The workflow is as follows:

  1. Check out the last merge branch, e.g. merge-vx.y.z
  2. Merge latest MINI404 (main) branch into the merge branch
  3. Resolve any conflicts.
  4. Merge the desired upstream release tag from QEMU.
  5. Fix conflicts, merge fallout, etc.
  6. Verify unit tests work, and e.g. run some simulated printer self-tests as a good exercise.
  7. Squash-merge the result back to MINI404.
  8. Repeat when the next sync happens.
Clone this wiki locally