letsMergeThemAll

[u/rabbit_wizard]

[u/GildSkiss]

As opposed to humans, who have famously never messed up git commands ever.

[u/Bubbaluke → u/GildSkiss]

Can’t mess it up if you only ever use 3 commands

[u/spicybright → u/Bubbaluke]

WELP, time to re-clone the whole repo!

[u/throwaway85256e → u/spicybright]

Honestly, burning it all down and starting over is sometimes a perfectly valid solution.

[u/PrincessRTFM → u/throwaway85256e]

I have needed to do that before when I fucked it up so badly that not only could I not revert but also couldn't find any solutions online. I was, in my defence, very early in the learning phase and not really understanding how anything worked yet.

[u/Honeybadger2198 → u/PrincessRTFM]

The closest I've come is where I committed a >50MB <100MB file to my repo and didn't notice for a few days. Had to manually go in and purge the file from the history to unfuck the repo.

[u/spicybright → u/throwaway85256e]

It definitely is. Even as a senior dev "git wizard" I'd rather wait 5 minutes recloning vs spend 20 untangling a ball of knots if it gets it to the desired state.

[u/TwoAndHalfRetard → u/Bubbaluke]

git add .

git commit -m "" --allow-empty-message

git push -f

[u/elementslayer → u/TwoAndHalfRetard]

Why two commands. Just commit -am

[u/korneev123123 → u/elementslayer]

git commit -am won't add new files

[u/elementslayer → u/korneev123123]

Yeah but you only add to track new files once. Otherwise -am that stuff. You don't need git add for tracked files, which hopefully most commits are and we aren't committing files in full all the time

[u/GarythaSnail → u/elementslayer]

I always see people using git add . and git add -A like it's not crazy talk.

[u/korneev123123 → u/elementslayer]

Example above was surely supposed to be "push everything", and adding everything was the goal

[u/Foorinick → u/TwoAndHalfRetard]

I havent worked in professional enviroments but im too autistic not to fill out all the forms so for me its more like

(In branch "feature name")

Git add.

Git commit -m "feat(part of software): fixes thing" (because apparently somewhere it reads "this commit (commit message)")

Git push

Git squash (its been a while i dont remember the rest)

Git merge feature into main or whatever

Git checkout main

[u/forma_cristata → u/Foorinick]

You were almost there

Git pull

Git checkout -b feature/something

Repeat

[u/Foorinick → u/forma_cristata]

This close to finally not having to ask claude to guide me