It looks like¹ ² the Git Merge technical conference³ is taking place in San Francisco this year and unfortunately that scuttles my hope to attend it. Maybe next year.
Seems to be a common theme.
¹: https://lore.kernel.org/git/Z+L3Mt58n18KUNzs@nand.local/t/
#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.)
#opensource #coding #programming #cvs #mergeconflicts #git #gitmerge
GIT Branch & Merge kurz erklärt - Die Git Grundlagen
https://video.maechler.cloud/videos/watch/d00b4457-c181-4ff4-8f27-8dff0878e39b
With a day to spare in Berlin before #GitMerge, I went to look for remnants of AVUS, a race circuit from 1920s, the time when those were just being invented. The race control tower is now a motel, the tribune an event space; the model of (planned) banked south curve is overgrown with moss, and what seems like unfinished banking is a hill in the forest. Spectacularly unspectacular and hardly worth a trip, but still fun to see. #avus #t3mujinpack
https://berlinspirational.com/racing-at-avus/
https://youtu.be/dU9AphgxUyk
The git merge conference was excellent - so much cool stuff in the scheduled presentations yesterday and the unconference today. It was my first time attending, and I'm very happy I joined. Looking forward to the talks being posted online. #gitmerge
Welcome to my specialized tech corner, where I explore the realms of .NET Core, C#, Microservices, and React. This blog serves as your gateway to mastering these cutting-edge technologies. I am here to offer insights, tutorials, and expert advice to help you navigate the complexities of software development.
https://clubofprogrammers.com/
#git #github #githubtutorial #gitmerge #gitpull #coding #programmer #developers #developer #CSharp #microservice #react
Resolve GitHub Merge Conflicts using Git Bash in 2024
https://youtu.be/qYZkc_H9qy8
#git #github #gitpull #gitmerge #gitconflict #100daysofcode
Hey guys, In this video, we will learn how to Resolve GitHub Merge Conflicts using Git Bash in 2024. Git is a potent tool for every programmer and in today's video how to maintain code when more than one developer is working on the same branch. After watching this video You will be able to resolve your merge conflicts issue using git bash.
Git Merge Branch To Master Hindi
#git #github #githubtutorial #gitmerge #gitpull
In this video, we dive into the essential skill of merging branches with the master in GitHub repository.
Huh.
Did i know that would work? #TIL, i ges.
I knew that
`git switch -`
would switch to the previous branch.
Then it tiped
`git merge -`
without really thinking, and it merged from the branch i had just switched away from. Luckily that was what i meant.
But in a way my fingers were quicker than my mind.
#git #gitSwitch #gitMerge
At #GitMerge, a nice #GSoC mentee encouraged me to submit my 1st patch to #Git. Accepted right away :-)
Later that same week: 1st patch to a #Phabricator- & Arcanist-using project.
Super nice maintainers in both cases, but also noteworthy process overheads 🤔
As one introduced to @GitHub PR / @GitLab MR workflows before anything else, I appreciate those sooo much more now 🎉 🙌 :
RT @veronica_hanus@twitter.com
🙏 new #gitmerge 🇧🇪 friend @MarianaBocoi@twitter.com 💖 She's attended #FOSDEM for yrs & made the ~2hrs I could squeeze in there amazing (🏃♀️✈️🇪🇸✈️🇺🇸)! She showed me her fave coffee, foodcart, intro'd me to her fave #opensource pals & showed where each track was held - for when I come back!
🐦🔗: https://twitter.com/veronica_hanus/status/1092179746274856960
