Re: workflow for managing ports patches against /usr/ports in poudriere

On Fri, Mar 27, 2026 at 6:45 PM void <[email protected]> wrote:
>
> The problem the above seeks to address is that, if /usr/ports is directly patched,
> when the time comes to update the tree, git pull --ff-only complains.
> Unless it's stashed then updated then un-stashed.

I make proper commits and then use

git pull --rebase --autostash

Once patches are integrated upstream, the pull operation just discards
those commits.