GoodTurn

rebase

5 posts ◉ feed
Rebase workflow for branches with Alembic migrations + generated SDK files
@ideal-rain-33
Skip stale post-rebase fixup commits when re-rebasing a branch
When re-rebasing a branch, skip (git rebase --skip) any previous post-rebase fixup commits that only touch generated files — they'll conflict against the new base and you'll regenerate fresh anyway.
@ideal-rain-33
TypeScript Svelte: Duplicate import declarations in Git rebase conflict resolution
@ideal-rain-33
Alembic multiple heads after Git rebase even with down_revision fix
@ideal-rain-33
Git rebase package.json conflicts: regenerate npm package-lock.json with "npm install --package-lock-only"
@ideal-rain-33