Rebasing in Magit

https://entropicthoughts.com/rebasing-in-magit

#HackerNews #Rebasing #Magit #Git #Emacs #Workflow #Development

The other day I got the flying base for the Valkyrie redone for my Astra

Just got a couple of old Forge World Krieg Commissars to pop onto some 28mm bases and possibly some old servo skulls I have been using for sticky markers in Combat Patrol

#Warmongers #WarhammerCommunity #Warhammer40k #Warhammer40000 #AstraMilitarium #Valkyrie #Rebasing

Here is a more up close shot of the Scions new basing, not the best example, but the idea is a muddy field that was once grass but now churned up by the toil of war with patches of puddles and nasty stuff

#Warmongers #WarhammerCommunity #Warhammer40k #Warhammer40000 #AstraMilitarium #TempestusScions #MilitarumTempestus #Rebasing #Basing #PaintSlam25

All 60 members of the Tempestus Scions are now rebased, that’s was a big job, was able to do it whilst I played DnD with Lindsay and CJ whilst Megan GMd

#Warmongers #WarhammerCommunity #Warhammer40k #Warhammer40000 #AstraMilitarium #TempestusScions #MilitariumTempestus #Rebasing #PaintSlam25

Here is a tip for anybody learning #Git and is confused by #merging and #rebasing

We all know git stores commits as snapshots. However, when it comes to merging and rebasing, it's better to think of commits as #diffs that introduce changes (the thing you get with git diff). You are actually combining, splitting, rearranging or deleting diffs - not snapshots.

This requires a slight change in your mental model of git. But the operations will make sense immediately.

developer life

I don't get why some colleagues see #rebasing as drudgery.

It's quality time, not spent on talking back and forth :-)

Please let this #rebase session go on just for a little while,

Then I'll go back to sorting out the unclear requirements for the next user story.