Rebase each files automically....

[mike-rambil]

✅ Step-by-step: Open only conflicted files in nvim

Get the list of conflicted files:

git diff --name-only --diff-filter=U

This filters for files with unmerged changes (aka conflict zones).

Open them all in nvim, one by one in tabs:

nvim -p $(git diff --name-only --diff-filter=U)

-p = open in tabs

$(...) = shell magic to insert the list of conflicted files

Now you can jump between them in nvim using:

:tabn → next tab

:tabp → previous tab

:tabdo Gdiffsplit → if you use fugitive for diff magic

🪄 After resolving each one:

Once you've cleaned up the chaos and picked a side in each file:

git add apps/whk-wms/prisma/schema.prisma
git add apps/whk-wms/src/app.module.ts

Or if you’re lazy:

git add $(git diff --name-only --diff-filter=U)

Then continue the rebase:

git rebase --continue