this post was submitted on 15 Sep 2023
715 points (97.2% liked)

Programmer Humor

19551 readers
978 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] Zeth0s@lemmy.world 33 points 1 year ago* (last edited 1 year ago) (2 children)

I never push as last thing in the evening. I want to sleep over it and revise in the morning. --amend crew unite

[–] Anticorp@lemmy.ml 8 points 1 year ago (2 children)

You should be pushing feature branches as you work on them, so if you have a crash or something, your work isn't lost. Builds should be triggered from pull requests on the main branch, if triggered by anything. You should never push directly to main. At least that's my preference.

[–] Zeth0s@lemmy.world 5 points 1 year ago* (last edited 1 year ago)

Our ci/cd pipelines build also feature branches. I do push often, clean code. I don't push when I am tired enough that I can't trust my judgment that the code I am pushing is over my personal quality threshold. I add meaningful, concise commit messages. These are my rules.

[–] TheManuz@lemmy.world 2 points 1 year ago

I make WIP branches only for that purpose, so I can push half done work and rework it the day after.

This means a lot of history changes, but only in the WIP branch.

When history is clean, I rebase the feature branch.

Is this a good practice? I never found a better way to backup partial code.

[–] Michal@programming.dev -1 points 1 year ago (2 children)

What if while you sleep over it your laptop gets stolen or damaged? I'd rather push every small change than sit on it.

[–] Zeth0s@lemmy.world 5 points 1 year ago* (last edited 1 year ago) (2 children)

I would lose max 3 hrs of work that I already know how to re do. I can live with that. I don't want to publish too much unfinished/unpolished work. There is always the chance someone might need the branch.

Even if drafts under development, I like to publish something that reaches the standard of my "best" me, not my "Friday evening" me

[–] Michal@programming.dev 2 points 1 year ago (1 children)

Why not? Do you push directly to master?

[–] Zeth0s@lemmy.world 0 points 1 year ago* (last edited 1 year ago)

Because someone else might need to work on something on or from my branches. And I don't want garbage in my history. There are cases I might not be able to squash merge, so all my history will be in the project history. I want each commit to be clean. It is not a lot of effort, and forces me to increase code quality, because I review my code more often.

Rules for all projects I manage: never rebase published branches and always publish clean code (even implementation is unfinished).

From experience following these simple rules make the whole project management easier and more effective

[–] explodicle@local106.com 1 points 1 year ago

Same here. At least for me, the hard part is figuring out how to do it.

[–] darklamer@lemmy.dbzer0.com 1 points 1 year ago (1 children)

Don't you have continuous backups of your work laptop!?

[–] Michal@programming.dev 1 points 1 year ago

On one occasion i had to take over a task from a colleague while he was on his day off. He did not push his changes. I am sure he had backups but when i asked him to push his changes he had to drive home to do it.

I'd rather company IP stays on its git server.