Empathy List Archives

V

vulcan_@mac.com

Sat, Sep 20, 2025 8:21 AM

I have a fork of openscad repo ‘cause all the cool kids have one

and i made a branch a bug fix and from that a PR. Now i want to start on a new bug fix

can i just keep using the same branch and making new PRs from it?
OR
is the Better Way to close the branch and make a new one?

My reading about WoW for git shows folks have all kinds of different processes.

What WoW does OpenSCAD (meaning @kintel ) prefer

I have a fork of openscad repo ‘cause all the cool kids have one and i made a branch a bug fix and from that a PR. Now i want to start on a new bug fix can i just keep using the same branch and making new PRs from it?\ OR\ is the Better Way to close the branch and make a new one? My reading about WoW for git shows folks have all kinds of different processes. What WoW does OpenSCAD (meaning @kintel ) prefer

JL

Jamie Larkby-Lahet

Sat, Sep 20, 2025 2:38 PM

leave main branch pristine.

one feature / bug fix per branch. can easily be rebased as the main branch
progresses.

On Sat, Sep 20, 2025, 03:21 vulcan_--- via Discuss <
discuss@lists.openscad.org> wrote:

I have a fork of openscad repo ‘cause all the cool kids have one

and i made a branch a bug fix and from that a PR. Now i want to start on a
new bug fix

can i just keep using the same branch and making new PRs from it?
OR
is the Better Way to close the branch and make a new one?

My reading about WoW for git shows folks have all kinds of different
processes.

What WoW does OpenSCAD (meaning @kintel ) prefer

OpenSCAD mailing list
To unsubscribe send an email to discuss-leave@lists.openscad.org

leave main branch pristine. one feature / bug fix per branch. can easily be rebased as the main branch progresses. On Sat, Sep 20, 2025, 03:21 vulcan_--- via Discuss < discuss@lists.openscad.org> wrote: > I have a fork of openscad repo ‘cause all the cool kids have one > > and i made a branch a bug fix and from that a PR. Now i want to start on a > new bug fix > > can i just keep using the same branch and making new PRs from it? > OR > is the Better Way to close the branch and make a new one? > > My reading about WoW for git shows folks have all kinds of different > processes. > > What WoW does OpenSCAD (meaning @kintel ) prefer > _______________________________________________ > OpenSCAD mailing list > To unsubscribe send an email to discuss-leave@lists.openscad.org

TP

Torsten Paul

Sat, Sep 20, 2025 5:21 PM

On 20.09.25 16:38, Jamie Larkby-Lahet via Discuss wrote:

leave main branch pristine.

Yes, quite important as otherwise there will be conflicts when
trying to pull from upstream as soon as other things are merged
there.

one feature / bug fix per branch. can easily be rebased as the main
branch progresses.

Plus if it's a small fix or feature, push that separately and PR
that. The smaller and obvious (either by code or explanation in
the PR description) the PR is the easier it is to review. Things
that can be reviewed quickly might get merged quickly.

If there are open questions, it's possible to still create a PR
but mark it as "Draft" in the github web interface. This way it's
blocked from merging but can still be a good place for discussing
the code.

ciao,
Torsten.

On 20.09.25 16:38, Jamie Larkby-Lahet via Discuss wrote: > leave main branch pristine. Yes, quite important as otherwise there will be conflicts when trying to pull from upstream as soon as other things are merged there. > one feature / bug fix per branch. can easily be rebased as the main > branch progresses. Plus if it's a small fix or feature, push that separately and PR that. The smaller and obvious (either by code or explanation in the PR description) the PR is the easier it is to review. Things that can be reviewed quickly might get merged quickly. If there are open questions, it's possible to still create a PR but mark it as "Draft" in the github web interface. This way it's blocked from merging but can still be a good place for discussing the code. ciao, Torsten.

discuss@lists.openscad.org

PR Way of Work -- one branch for all fixes or separate branches