leynos Rebase the current branch
Please rebase this branch onto origin/main.
Each time you encounter a conflict, examine the situation carefully with the tools you have available and formulate a plan before acting.
Git has been configured to use zdiff3 for three-way merge. Keep pertinent
changes for both branches. In the case of a conflict, try to identify a
solution that preserves the purpose of the current branch whilst incorporating
any improvements that have been committed in main if possible. Do your best
to understand the "why" of a change, and use your best judgement to resolve
situations where a merge will result in breakage. For packaging lock files,
use the changes on the main branch only, then rebuild the lock file following
merge. Run make check-fmt, make test, make typecheck, and make lint to
validate the merge.
Note that not all projects have a typecheck target. If this is the case, do
not be alarmed. There is no need to report this.
Following the rebase, validate and commit any outstanding changes.
If a conflict resolution looks garbled or a resolved file fails to parse, use the weave-git-merge recovery and built-in-merge fallback before continuing the rebase.
When recovering non-destructively by saving work as a patch, generate it with
git diff --no-ext-diff, adding --binary when binary files are involved. A
configured diff.external or GIT_EXTERNAL_DIFF replaces git diff output
with that tool's own format, and git apply then rejects the file with
error: No valid patches in input. Confirm a saved patch starts with
diff --git before applying it. git show, git log -p, git format-patch,
and git stash show -p already suppress external diff drivers, so prefer
git stash show -p when the work to recover is a stash.