this post was submitted on 20 Aug 2024
619 points (88.6% liked)

Showerthoughts

30010 readers
596 users here now

A "Showerthought" is a simple term used to describe the thoughts that pop into your head while you're doing everyday things like taking a shower, driving, or just daydreaming. A showerthought should offer a unique perspective on an ordinary part of life.

Rules

  1. All posts must be showerthoughts
  2. The entire showerthought must be in the title
  3. Avoid politics
    • 3.1) NEW RULE as of 5 Nov 2024, trying it out
    • 3.2) Political posts often end up being circle jerks (not offering unique perspective) or enflaming (too much work for mods).
    • 3.3) Try c/politicaldiscussion, volunteer as a mod here, or start your own community.
  4. Posts must be original/unique
  5. Adhere to Lemmy's Code of Conduct

founded 2 years ago
MODERATORS
 

It sounds way less offensive to those who decry the original terminology's problematic roots but still keeps its meaning intact.

you are viewing a single comment's thread
view the rest of the comments
[–] Omniraptor@lemm.ee 1 points 4 months ago (1 children)

Wait huge? Shouldn't Prod be the last place any changes go ?

[–] aodhsishaj@lemmy.world 1 points 4 months ago* (last edited 4 months ago) (1 children)

In our environment Prod is only a holding area, the change/feature/bugfix is already approved for production, once the change is documented then the merge happens into main and Prod is consumed.

Our "working" branches are ephemeral.

[–] AA5B@lemmy.world 1 points 4 months ago (1 children)

Seems like what we use “RC” for (Release Candidate)

[–] aodhsishaj@lemmy.world 1 points 4 months ago* (last edited 4 months ago) (1 children)

Yeah, we're trying to avoid a lot of hanging branches with no documentation so we try to prune as much as possible. So we built pruning and documentation into the workflow of the pipeline.

[–] AA5B@lemmy.world 3 points 4 months ago

Great! The best I’ve been able to do is document a best practice to default to deleting the source branch on merge. I actually just now finished writing a script to list all repos with various details including the setting about deleting source branches on merge. I’ll talk to a few teams about it, then see if I can get management approval to set it for all repos (you can click to override in the merge request so it seems harmless)