ipconf@lemmy.ml to Programmer Humor@programming.dev · 4 months agoWell well well.lemmy.mlimagemessage-square2linkfedilinkarrow-up11arrow-down10file-text
arrow-up11arrow-down1imageWell well well.lemmy.mlipconf@lemmy.ml to Programmer Humor@programming.dev · 4 months agomessage-square2linkfedilinkfile-text
minus-squareEphera@lemmy.mllinkfedilinkEnglisharrow-up2·4 months agoI’ve had juniors who didn’t believe this, so just to say it: If you know what you’re doing, practically any Git problem is recoverable. The one major exception is if you delete your local changes before committing them.
minus-squaresorter_plainview@lemmy.todaylinkfedilinkarrow-up1·4 months agoYeah.But many of them are extremely annoying. Specifically screwing up rebase. It is recoverable, but very annoying. That said I have seen juniors make two other common mistakes. Pushing your commit without fetching Continuing on a branch even after it was merged. I’m fed up with these two. Yesterday I had to cherry-pick to solve a combination of these two.
I’ve had juniors who didn’t believe this, so just to say it: If you know what you’re doing, practically any Git problem is recoverable.
The one major exception is if you delete your local changes before committing them.
Yeah.But many of them are extremely annoying. Specifically screwing up rebase. It is recoverable, but very annoying.
That said I have seen juniors make two other common mistakes.
I’m fed up with these two. Yesterday I had to cherry-pick to solve a combination of these two.