Christian Gmeiner1d ago

Yeah… cleaning up a long-lived git branch with more than 200 commits will take some time. There are reverts, hacks, and all sorts of fun issues.

Pro tip: don’t keep your feature branches alive for too long - in my case, 2 years. Catching up with upstream is painful.

#mesa3d #etnaviv

Show thread☃️karolherbst☃️
@austriancoder normally in such a case I always rebase release by release...
Mar 25 at 4:36pmWeb
Show threadChristian Gmeiner1d ago

@karolherbst I’ll remember this tip for the next feature branch. I actually started catching up with upstream about six months ago. I’m now at a point where I think everything works as expected, but there’s still a lot of cleanup left to do.

The biggest pain point is that about 4–5 months ago, I decided to slowly change the core architecture. I probably should have started fresh back then… but yeah, I didn’t have anything better to do at night.

Show threadChristian Gmeiner1d ago
@karolherbst best commit message so far: "hacks.. again .." 😅
Show thread☃️karolherbst☃️1d ago
@austriancoder dev branches be like: "HACKS..." "WIP" "HACKS HACKS HACKS 🧙"
Show threadMartin Roukala (né Peres)9h ago

@austriancoder @karolherbst ha ha! Mine can be up to 50 commits named WIP, until I reach a point I am happy with to make a bunch of commit from them... Then here we go again until the MR comes out :)

This way, I can always bisect brokenness, even when I am just trying shit out.