Jared-Waldroff

Rebase current branch onto trunk (origin/master or origin/main), predict and resolve conflicts