Branch pruning and switch to PRs from a fork

glen commented

2025-02-06 22:57:33 +00:00

Owner

I haven't been pruning branches in merges because every time I have asked about it, the conclusion we have reached is not to prune. The outcome is the branch structure in the main repo has become very cluttered. So please
(a) fork the repo to work on it
(b) prune any branches in the main repo that you're not certain we have some plausible use for
(c) Do whatever you like with the branches in your fork ;-) (that's the real reason to fork)
(d) Please issue PRs from a fork going forward.

Thanks so much! You can close this issue once you have completed (b).

I haven't been pruning branches in merges because every time I have asked about it, the conclusion we have reached is not to prune. The outcome is the branch structure in the main repo has become very cluttered. So please (a) fork the repo to work on it (b) prune any branches in the main repo that you're not certain we have some plausible use for (c) Do whatever you like with the branches in your fork ;-) (that's the real reason to fork) (d) Please issue PRs from a fork going forward. Thanks so much! You can close this issue once you have completed (b).

Vectornaut was assigned by glen

2025-02-06 22:57:37 +00:00

Vectornaut commented

2025-02-07 08:15:26 +00:00

Collaborator

Here's a preview of what I'd prune and what I'd keep. Let me know if you'd like any changes! If we regret pruning a branch, will recovering it be as easy as pushing it again from my fork?

Prune

Merged into `main`

normalize-by-contracting: #43
uniform-projection: #34
tangent-space: #29
select-in-display: #25
cargo-examples_on_main: #24
element-serial: #22
outline-cleanup_on_main: #19
engine-integration: #15
app-proto: #14
engine-proto: #13

Superseded by a branch that was merged into `main`

cargo-examples: rebased onto main and merged in #24
outline-cleanup: rebased onto main and merged in #19
gram: extended to engine-proto and merged in #13

Unlikely to come in handy

macaulay2: A quickly-abandoned effort to use Macaulay2 in the algebraic solver prototype

Keep

kaleidocycle-example: Soon to be rebased and merged
outline-update-fix: superseded by a new approach, but kept in case we reconsider, as described here
lang-trials: Usefully records our explorations of candidate programming environments
seed-problem: Solves a subtle reproducibility problem in the algebraic engine prototype

Here's a preview of what I'd prune and what I'd keep. Let me know if you'd like any changes! If we regret pruning a branch, will recovering it be as easy as pushing it again from my fork? ## Prune ### Merged into `main` * `normalize-by-contracting`: #43 * `uniform-projection`: #34 * `tangent-space`: #29 * `select-in-display`: #25 * `cargo-examples_on_main`: #24 * `element-serial`: #22 * `outline-cleanup_on_main`: #19 * `engine-integration`: #15 * `app-proto`: #14 * `engine-proto`: #13 ### Superseded by a branch that was merged into `main` * `cargo-examples`: rebased onto `main` and merged in #24 * `outline-cleanup`: rebased onto main and merged in #19 * `gram`: extended to `engine-proto` and merged in #13 ### Unlikely to come in handy * `macaulay2`: A quickly-abandoned effort to use Macaulay2 in the algebraic solver prototype ## Keep * `kaleidocycle-example`: Soon to be rebased and merged * `outline-update-fix`: superseded by a new approach, but kept in case we reconsider, as described [here](pulls/21#issuecomment-1918) * `lang-trials`: Usefully records our explorations of candidate programming environments * `seed-problem`: Solves a subtle reproducibility problem in the algebraic engine prototype

glen commented

2025-02-07 15:20:09 +00:00

Author

Owner

Looks perfect and yes restoring is that easy, if you have kept a branch in your fork. Thanks! (And don't feel obliged to keep lots of branches in your fork either, in practice I have never wanted the intermediate stages of a merged branch.)

Vectornaut commented

2025-02-07 19:09:13 +00:00

Collaborator

Done!

Vectornaut closed this issue

2025-02-07 19:09:13 +00:00

Rows
Columns

Branch pruning and switch to PRs from a fork #45

Prune

Merged into main

Superseded by a branch that was merged into main

Unlikely to come in handy

Keep

Merged into `main`

Superseded by a branch that was merged into `main`