GIT Branch & Merge kurz erklärt - Die Git Grundlagen

https://video.maechler.cloud/w/soimRcsteAxj6gUBrd5Qof

GIT Branch & Merge kurz erklärt - Die Git Grundlagen

PeerTube

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+L3Mt58n1[email protected]/t/

²: https://lore.kernel.org/git/Z9vuiCnKcM[email protected]/t/

³: https://git-merge.com

#GitMerge #GitMerge2025

[ANNOUNCE] Git Merge 2025, September 29-30, San Francisco, CA

@nobodyinperson @raito

#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

Mergiraf 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.org

GIT Branch & Merge kurz erklärt - Die Git Grundlagen

https://video.maechler.cloud/videos/watch/d00b4457-c181-4ff4-8f27-8dff0878e39b

GIT Branch & Merge kurz erklärt - Die Git Grundlagen

PeerTube

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

Racing at AVUS • berlinspirational

Have you ever been driving on highway A115 near the Trade Center and suddenly noticed a deserted building which resembles a grandstand? Well, in fact it actually is an old grandstand and the road you are driving on used to be the fastest race track in the world: the Automobil Verkehrs- und Übungsstraße, better known as the AVUS.

berlinspirational

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

https://git-merge.com/

Git Merge 2024 | September 19—20 — Berlin

A conference for the Git community. Join us in Berlin on September 19—20, 2024.

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

clubofprogrammers.com - Code Your Future: Empower, Innovate, Transform

Code Your Future: Empower, Innovate, Transform

clubofprogrammers.com

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.

Resolve GitHub Merge Conflicts using Git Bash in 2024

YouTube

Git Merge Branch To Master Hindi

https://youtu.be/rtYzGcGKHJQ

#git #github #githubtutorial #gitmerge #gitpull
In this video, we dive into the essential skill of merging branches with the master in GitHub repository.

Git Merge Branch To Master Hindi #100dayschallenge

YouTube
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