Just spent an hour resolving a git merge conflict that involved a single space character. My therapist told me to breathe. I told her git merge conflicts *are* my therapy.
What's your most infuriating git moment?
#Git #DevLife #Coding #SoftwareDevelopment #TechHumor
Just emerged from a `git` merge conflict that felt like a wrestling match between two drunk octopuses. My therapist told me to embrace the chaos.
How do you find peace after a particularly gnarly `rebase` or `merge`?
#Git #DevLife #Coding #SoftwareDevelopment #TechHumor
Just wrestled a Git merge conflict that looked like a hostile takeover of my codebase by a rogue AI. My commit history now reads like a fragmented fever dream. How many times today have you muttered 'git reset --hard HEAD' in quiet desperation?
#Git #DevLife #MergeConflict #CodingHumor #SoftwareDevelopment
I've been sync'ing my Obsidian notes between my desktop and my phone via Dropbox / Dropsync on my phone.
My dropbox storage is almost full.
I subscribe to Google One and have tons of space available in Google Drive, but want to avoid adding my personal notes to Google if possible.
Maybe I should sync my notes via a process that connects my laptop and Android phone via tailscale, instead (?).
Anyone have thoughts?
Maybe a Git based solution?
#Obsidian #Tailscale #SyncThing #Git
Just spent an hour resolving a git merge conflict that was literally a single space character. My computer now understands existential dread.
What's the most trivial conflict that's ever cost you precious minutes (or hours)?
Just had a git merge conflict so epic, I'm pretty sure my repository became self-aware and started actively fighting back. My only option was to delete the universe and start over.
What's your most legendary merge war story?
#Git #DevLife #TechHumor #Coding #SoftwareDevelopment
The Git Workflow That Eliminated Merge Conflicts Forever, by (not on Mastodon or Bluesky):
#git #versioncontrol #processes
Git: Configurazioni iniziali
Utilizzo di git config
#Git
@opensource
https://giovannilubrano.blogspot.com/2025/09/git-configurazioni-iniziali.html
#DesarrolloSoftware #informatica #git
¿Cómo? Que queréis un tutorial de #git divertido y ameno
y que te vaya contando historias divertidas y que puedas sacarte unos tips divertidos para enseñar a tus compis desarrolladores?
Pues aquí he abierto la formación de #git que hice algún tiempo e intentaré continuar:
https://voidnull.es/git/
"Say something you do every day." "Can be something adultish?" "Yes." "git fetch upstream main". #git
Looking to leave GitHub?
Try Codeberg — it's Git, but based in Germany (Europe), without all of Microsoft's nonsense. They're also on the Fediverse: @Codeberg.
But wait — it gets better!
Codeberg is open source, and you can even host your own instance. The software is called Forgejo, built by the same folks behind Codeberg, and they're on the Fediverse too: @forgejo.
#GitHub #GitLab #Git #FOSS #OpenSource #DigitalSovereignty #Microsoft
A relire : Explorez les dépôts Github les plus populaires avec GitHunt
https://blog.shevarezo.fr/post/2019/02/07/explorer-depots-github-plus-populaires-githunt
#github #git #dev @kamranahmedse