- cross-posted to:
- programmer_humor@programming.dev
- cross-posted to:
- programmer_humor@programming.dev
You must log in or register to comment.
Git is great. Git is Complicated. But assuming you have a protected master branch that requires PRs and will detect merge conflicts before attempting to merge, it’s not really dangerous. It is however frustrating.
I mean, you just need to look at the conflicting files, fix up the code, then stage those changes and pop a new commit
There’s no “special” merge conflict resolution commit “type”
As for fixing the code itself, I usually look at what changed between both versions, and then re-author the code such that both changes make “sense”
IN CASE OF FIRE: 1. git commit 2. git push 3. exit buildingTHE CAUSE OF FIRE: 1. git pull 2. merge conflict 3. starting fire
One hell of an emergency number
No AI summary 😍
You can prevent suicide by eating a pizza made with glue ✨✨
Prevent or commit?
It’s cropped out u_u
If you’ve ever royally fucked something up in git, that hotline is necessary
How dare you! First of all, it’s a beautiful distributed graph theory tree model…
I have been that friend from the alt text at every place I have worked. I shudder to think how they’re going about their projects without me, now.
I’m kinda planning on teaching my team how to use interactive rebases to clean the history before a merge request.
The first thing they’ll learn is to make a temporary second branch so they can just toss their borked one if they screw up. I’m not going to deal with their git issues for them.
I’m kinda planning on teaching my team
I’m not going to deal with their git issues for them.
These two statements contradict each other.
Never understood why this is such a trope. There’s very little you can’t recover in git (basically, only changes you never committed in the first place).
Have you ever tried a rebase?
Not sure if serious or not, but yeah I use interactive rebases every day, many times a day (it’s nice for keeping a clean, logical history of atomic changes).
It’s very simple to recover if you accidentally do something you don’t intend (
git rebase --abortif the rebase is still active,git reflogto find the commit before the rebase if it’s finished).
git push --force
It moves the suicide to the other end of the repository.
“Fuck the code review!”
I actually feel disgusted when I see Google search now. It’s just so bad that even the logo does it.
Doesn’t
git statustell you what to do?use “git add <file>…” to mark resolution
use “git commit” to conclude merge
I always use
git statusto check what is appropriate before doing anything else, since the right thing to do can sometimes be different, like after usinggit rebasewhen abreakcommand was used vs when asquashcommand resulted in a conflict.To be fair that’s not the entire story, since you need to actually resolve the conflicts first, which is slightly scary since your worktree will be broken while you do it and your Linter will be shouting at you.
You may also want a dedicated merge tool that warns you before accidentally commiting a conflict and creating a broken commit.
Oh and non trivial resolutions may or may not create an evil merge which may or may not be desirable depending on which subset of git automation features you use.
Using
git statusoften is definitely good advice though.Magit for Emacs is an excellent tool for resolving conflicts.
Branching version control was definitely a “they have played us for absolute fools” moment. Especially after all our projects ended up as isolated branches on isolated microservice repositories so basically none of our code was being integrated, let alone continuously. Good for full-remote open source projects where a central admin team has to police submissions though.
I will say. if you have no idea at least clone your branch so you can experiment on it.
Experiment on the suicide hotline? I’m sure they won’t appreciate that!
Praise be Magit, which actually allows me to handle stuff like that moderately confidently.
