this post was submitted on 19 Feb 2024
53 points (98.2% liked)

Programming

17377 readers
379 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev



founded 1 year ago
MODERATORS
 

Whether you're steering an open source project or leading full-time a software development team, the key to maximizing productivity lies in efficient code reviews.

you are viewing a single comment's thread
view the rest of the comments
[–] CameronDev@programming.dev 2 points 8 months ago (1 children)

I do almost exactly that workflow as well, but I just know its bitten me before. Protecting main/dev is fine, but I have also accidentally force pushed to the wrong branch and wiped out its work as well.

Muscle memory + Fatigue == Bad time :/

[–] tatterdemalion@programming.dev 4 points 8 months ago (2 children)

Pays to know how to recover code from the reflog in these cases.

[–] CameronDev@programming.dev 3 points 8 months ago

Yeah, or sprint to your colleague and ask them to force push their branch again :D

Another tactic for for getting clean git commits is to do all your messy commit work in a scratch branch, and then when your happy, create a new branch, and with meld, organise your changes into complete logical commits. We do that a little bit.

[–] SmartmanApps@programming.dev 2 points 8 months ago (1 children)

Pays to know how to recover code from the reflog in these cases.

At first I read that as re-flog. Is that with a cat o' nine tails? 😂

[–] tatterdemalion@programming.dev 2 points 8 months ago

Your Git requires a regular flagellation to function properly.