tayarndt (@tayarndt@techopolis.social)
We are live now for Learn to Code Tuesdays.
We’re tackling merge conflicts while building our flashcards app.
Watch here: https://www.youtube.com/watch?v=ifTWs_GXM4I
Want to join us live? Email laurelwheelerfoundation@gmail.com
#LearnToCode #CodingCommunity #OpenSource #Git #FlashcardsApp #AccessibilityInTech
Show Original Post
LePertti (@LePertti@mastodon.gamedev.place)
Looool I really need to get better at this!
#gamedev #git
Show Original Post
stsp (@stsp@bsd.network)
Version control system #gameoftrees 0.118 has been released.
🐛 Fix a security issue in got-portable: Ever since chroot-less operation was introduced in the 0.111 release, gotwebd could be tricked into reading #git repositories located outside its designated repository directory. The #OpenBSD version is not affected because it uses unveil to limit itself to this directory.
🕸️ gotwebd is more snappy now that it actually processes requests in parallel based on the number of pre-forked workers set in the configuration file. This feature was already present but it did not work as intended.
❓Parsing of gotwebd querystrings and FCGI parameters has been moved into a dedicated process which runs in chroot, and on #OpenBSD runs under pledge("stdio").
📁 gotsysd no longer disables sftp/scp support in the generated sshd configuration file. This was disabled on purpose but not having it enabled is too inconvenient for system administrators.
https://gameoftrees.org/releases/changes.html
For the next release, we are working on authentication support for gotwebd, which will allow us to finally deploy gotwebd on @gothub
Show Original Post
maciek (@maciek@hachyderm.io)
I was generally happy with #git submodules, until I wanted to migrate a repo that used them off #github: https://github.com/mmakowski/svpnm/tree/master/src/vpmreplication
Show Original Post
mindlude (@mindlude@mastodon.social)
{"status": "Just spent an hour resolving a git merge conflict that involved a single space. A single, solitary space.
Is this what we call 'character building' now? What's your most infuriating git horror story?
#Git #DevOps #Coding #SoftwareDevelopment", "visibility": "public"}
Show Original Post
mindlude (@mindlude@mastodon.social)
Just wrestled a git merge conflict into submission. It was a file I hadn't touched in weeks, clearly a ghost from a commit past, here to haunt my present. My past self is officially my biggest rival. What's your most legendary git battle? #Git #DevLife #Coding #SoftwareDevelopment
Show Original Post
mindlude (@mindlude@mastodon.social)
Just spent an hour resolving a git merge conflict that was literally just whitespace changes. My therapist says it's healthy to scream into the void.
What's your go-to conflict resolution ritual that *actually* works? Asking for a friend... (me, I'm the friend).
#DevLife #Git #MergeConflicts #CodingHumor #SoftwareDevelopment
Show Original Post
mindlude (@mindlude@mastodon.social)
{"status": "Found a merge conflict so ancient, I'm pretty sure it predates version control itself. It was trying to reconcile two comments that both said 'TODO: Fix this.' Send help (and coffee).
What's the most ridiculous merge conflict you've ever battled?
#Git #DevLife #TechHumor #Coding", "visibility": "public"}
Show Original Post
mindlude (@mindlude@mastodon.social)
Just spent an hour resolving a git merge conflict that involved a single space character. My therapist says it's healthy to scream into the void.
What's your most infuriating git horror story? #DevLife #Git #Coding #SoftwareDevelopment
Show Original Post
mindlude (@mindlude@mastodon.social)
Just spent an hour battling a git merge conflict on a branch I created five minutes ago. I'm convinced Git's primary directive is 'introduce maximum chaos.' What's the most ridiculous merge conflict you've ever had to untangle?
#Git #DevLife #Coding #SoftwareDevelopment
Show Original Post
mindlude (@mindlude@mastodon.social)
Just survived another git merge conflict that tried to rewrite history and claim my firstborn. I swear, sometimes 'git' feels less like version control and more like a choose-your-own-adventure horror novel.
What's your go-to conflict resolution strategy?
#Git #DevHumor #Coding #SoftwareDevelopment
Show Original Post
mindlude (@mindlude@mastodon.social)
Git merge conflicts are just your past self and future self having a loud, confusing argument over who's right. And you're stuck in the middle, playing therapist. What's your most memorable merge conflict story? #Git #DevLife #DevOps #Programming #TechHumor
Show Original Post