Alcuni scatti con @lorenzodm @italovignoli @hammer al @Merge_IT con cena pre e post Merge dopo aver presentato @BoostMediaAPS ed Ufficio Zero EDU il 21 giugno in anteprima. La release uscirà a breve… Stay tuned!
#merge
0 posts0 participants0 posts today
In attesa della presentazione di Boost Media APS e di Fedimedia APS al Merge domani mattina a Verona, proponiamo una intensa chiacchierata tra Lorenzo De Marco, Julian Del Vecchio e Filippo Della Bianca davvero interessante.
Vi aspettiamo al Merge domani in Via Lungadige Galtarossa 21 Verona.
Curiosi di vedere cosa può fare @ufficiozero EDU? Vi aspettiamo con @lorenzodm e @BoostMediaAPS al @Merge_IT a Verona sabato 21 giugno
Città di VeronaMerge-it: conferenza nazionale delle community openLa quarta edizione della conferenza MERGE-it, l'incontro biennale delle comunità italiane per le libertà digitali torna a Verona dal 20 al 22 giugno 2025.
Continued thread
Replied to ℒӱḏɩę 
@Lydie
People around here just simply can't ever go the speed limit.... It's either way too slow or way to fast. Yield is the unique scenario where someone will drive too slow until the very second they hit the actual travel lane and instantly switch to too fast..... Like why couldn't you just start with that? I move over to let a slow ass driver in and then get stuck in the race track because dumbass is now going fast and won't let me back over.
Then there are the roundabouts on route 9 where yield means either stop or floor it with all disregard.
Aaaaand I better stop working myself up *before* I have to go out into this mess later today lol
Replied in thread
#Nix support is now ready and has been included in the brand new 
#Mergiraf v0.6.0 release!
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.6.0
(Mergiraf is a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't.)
Codeberg.orgMergiraf 0.6.0 - mergiraf/mergiraf### New languages
* SystemVerilog (*.sv, *.svh), by @come_744 (#226)
* Nix (*.nix), by @funkeleinhorn (#183)
### New features
* feat(LangProfile::detect_from_filename): handle extension comparison more correctly, by @ada4a (#220)
* feat(`MergedTree::line_based_local_fallback_for_revnode`)...
Codeberg.orgMergiraf 0.5.0 - mergiraf/mergiraf### New languages
* PHP, by @zanbaldwin (#104)
* Solidity, by @karlb (#138)
* TSX, by @zivarah (#140)
* Lua, by @zivarah (#146)
* Kotlin, by @wetneb (#56)
* Devicetree, by @funkeleinhorn (#175)
* Ruby, by @wetneb (#182)
### Improvements
* The histogram diff algorithm is used for line-b...
git mindfuck of the day:
• While merging branch B into branch A, A is “ours”, B is “theirs” (changes from B are reflected in A)
• When rebasing branch B on top of branch A, A is ”ours”, B is “theirs” (changes from A are reflected in B)
nitaym.github.iogit - ours vs theirs
If you could merge two different animals to create the ultimate animal, what two animals would it be and what would be their product?
#CriticalQuestions #Quiz #PubQuiz #Animals #Merge #Ultimate #StayHome #StaySafe #StayHomeStaySafe