brokenix (@brokenix@emacs.ch)
oh this is messy , gory
#git git merge-file fruits produce veggies --union -p > produce
https://stackoverflow.com/questions/46611465/git-combining-two-files-into-one-with-history-preserved
Show Original Post
yihangho (@yihangho@mastodon.social)
I gave radicle.xyz a try and here are my thoughts: https://www.yihangho.name/posts/thoughts-on-radicle/
Show Original Post
RemeJuan (@RemeJuan@fosstodon.org)
"7 tips for improving your productivity with Git - DEV Community 👩💻👨💻" https://dev.to/dgenezini/7-tips-for-improving-your-productivity-with-git-ajg #git #versioncontrol #tips
Show Original Post
AstraKernel (@AstraKernel@infosec.exchange)
✨ GitButler
🔶 Git client that lets you work on multiple branches at the same time
🔶 Organize file changes into separate branches while still having them applied to your working directory
🔶 Powered by Tauri/Rust/Svelte
https://github.com/gitbutlerapp/gitbutler
Show Original Post
opdavies (@opdavies@mastodon.social)
If everyone works on their own branch, no-one gets any changes.
https://www.oliverdavies.uk/archive/2024/04/25/if-everyone-branches-no-one-gets-updates
#dev #SoftwareDevelopment #git
Show Original Post
mcmartin (@mcmartin@mastodon.gamedev.place)
It's time to finally write up what may be my most terrifying open-source project to date: late last year I did some work near the VICE 8-bit Commodore emulator to see what it would take to properly migrate over 25 years of dev history into Git.
I succeeded, at a terrible cost. Come share in my blasphemous knowledge.
https://bumbershootsoft.wordpress.com/2024/04/27/a-complex-svn-to-git-migration-part-1/
Show Original Post
Taffer (@Taffer@mastodon.gamedev.place)
New post - Auto-deploy: Hugo and Codeberg CI https://taffer.ca/posts/2024/hugo-ci/
A description of how I’ve set up Codeberg’s CI to automatically build and deploy changes to my website.
#Codeberg #Git #Howto #Hugo #Tools
Show Original Post
m_j (@m_j@piaille.fr)
Si vous n'aviez rien prévu pour le week-end, j'ai ce qu'il vous faut :
Un mémo à destination des développeurs au sujet de #Builder, un #Framework de développement pour #GNOME par son créateur, Christian HERGERT.
Comme il se doit, mémo :
— créé en #TeXLaTeX + #Git
— sources mises à disposition
— projet sur un #Git vraiment #libre, celui de #GNOME.
😍 😍 😍
Sources : https://gitlab.gnome.org/chergert/builder-a-developers-notebook/-/tree/main/tex
via @TheEvilSkeleton
Show Original Post
RhetTbull (@RhetTbull@fosstodon.org)
This is a silly little thing I find useful. I #debug my #python with print() sometimes and want to see if I left any print statements lying around. This script can be run with `git print` and shows any modified files that have print statements.#git
Show Original Post
opdavies (@opdavies@mastodon.social)
Do you test topic branches in isolation?
https://www.oliverdavies.uk/archive/2024/04/26/testing-topic-branches-in-isolation
#dev #SoftwareDevelopment #git
Show Original Post
robcornelius (@robcornelius@climatejustice.social)
this is the truth
https://stevelosh.com/blog/2013/04/git-koans/
Show Original Post
weirdwriter (@weirdwriter@tweesecake.social)
I'm not a perfect Luddite.
I'm not the perfect #Luddite because while I do detest tech culture, the below tech excites me and I'm supposed to be skeptical of all tech, even small tech.
#Email which connects people.
#Git and similar because it's great for many things, including tracking differences and more.
#Pandoc because it is very lightweight and just all the things for converting documents, to me.
#Podcasts because, well, an open broadcast medium? Audio only? Yes! Yes! I've fully replaced my Audible subscription with some amazing fiction podcasts.
#SMS because it works no matter what phone someone has. Yes I know it's old and unsecured blah blah blah. It works.
Torrents. Peer to Peer. Fediverse. PeerTube. XMPP.
#RSS feeds because it's just the best. No algorithms. Works on multiple devices, super easy to use if you have a good client/add on. Cross platform. For most feeds not behind a pay wall, no login required.
Oh and also, things like #Markdown where people can have a very easy way to format pages and more.
Powershell and terminal things excite me even though I am a bad speller.
Blogs because, well, personal websites and blogs will always be better than social media to me because I like long form content. Same with lengthy podcasts, fiction and nonfiction.
Show Original Post