Skip to content

docs: the fork-rebase runbook drops desktop_workspace #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddespinoza merged 1 commit into from
Oct 27, 2026
Merged

docs: the fork-rebase runbook drops desktop_workspace #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/fork-rebase.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
How an APS-Conecta fork app takes a new upstream: **rebase**, one local feature per commit,
then verify with the repo's own gates. Written from the IntraVox rebase (instalador #35 —
47 local commits onto a pre-rewrite upstream, eight conflict seams resolved by hand);
eurooffice and desktop_workspace follow the same road.
eurooffice follows the same road.

A rebase rewrites the fork's `main`. Do it on a branch, keep a backup ref, and diff the
result against it before anything is pushed — the old tags (the bake's pins) stay where
Expand Down