Skip to content

fix(update): preserve and rebase committed local patches, and report real rebase conflicts - #70953

Open
mhuttes14 wants to merge 2 commits into
NousResearch:mainfrom
mhuttes14:mhuttes14/update-committed-patch-rebase
Open

fix(update): preserve and rebase committed local patches, and report real rebase conflicts#70953
mhuttes14 wants to merge 2 commits into
NousResearch:mainfrom
mhuttes14:mhuttes14/update-committed-patch-rebase

fix(update): report what actually conflicted when a patch rebase fails

eaf565a
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs