Ok, well I was looking for a new project - guess I’m making git-ar hero now
Is the goal to make branch commands that match a specific song? That’s be fun.
Use the guitar controller to branch, commit, and merge to the beat of Through The Fire And Flames and try to get a conflict-free repo.
Presented without comment: https://www.youtube.com/watch?v=wesICmc48UE
Jazz 2.0 just dropped
Jazz 2.0 just dropped
LOL!
That or Progressive Acid Folk.
Dad joke for coders? Ooooo… you!
Next version git-tar hero, where you also need to take care of the tar process
Although I don’t have a realistic direct use case, I thought the name and complexity of the game should be worth it
Here is the git-music Video: https://www.youtube.com/watch?v=S9Do2p4PwtE
in the projects i work in i always try to force semi linear history to avoid all of this, never merge (unless it’s the MR) always rebase.
this leaves a very readable history, with each feature branch highlighted and no mixture in the commits…
i haven’t found any downside yet… maybe that some ci/cd are built to push to main, but making them do branch pr automerge is not that difficult
Look at this person over here using branches, show off
Trunk based: am I a joke to you
Lmao still nicer than mine.
I’ve seen worse … so much worse.
I have made worse, I used to do a cascading merge everyday to move stuff from dev branches to staging to production. Then I did a merge in the opposite direction for a small selection of branches so they could get their updates from staging. Feature branches were rebased as needed.
Nah, just sort by date instead of topology, or vice versa.
I wonder if anyone’s tried to play Bad Apple! on the branch graph.
(edit) Not exactly, but close. https://www.youtube.com/watch?v=-I8Jis87nmE
tomfoolery, even
This in fact is vert good d’or large trams that work on 3 to 7 featyres or bug fixes in thé aame tome. Simple, ans vert easy to trace.
I’ve se en much much worse where you can’t keep track of where branches come from and where they go, and even if you do, you cannot predict what they can contain.