• 1 Post
  • 47 Comments
Joined 4 months ago
cake
Cake day: February 23rd, 2024

help-circle









  • I feel the opposite, but for similar logic? Merge is the one that is cluttered up with other merges.

    With rebase you get A->B->C for the main branch, and D->E->F for the patch branch, and when submitting to main you get a nice A->B->C->D->E->F and you can find your faulty commit in the D->E->F section.

    For merge you end up with this nonsense of mixed commits and merge commits like A->D->B->B’->E->F->C->C’ where the ones with the apostrophe are merge commits. And worse, in a git lot there is no clear “D E F” so you don’t actually know if A, D or B came from the feature branch, you just know a branch was merged at commit B’. You’d have to try to demangle it by looking at authors and dates.

    The final code ought to look the same, but now if you’re debugging you can’t separate the feature patch from the main path code to see which part was at fault. I always rebase because it’s equivalent to checking out the latest changes and re-branching so I’m never behind and the patch is always a unique set of commits.










  • Here I’ll add some context

    It is pretty easy not to think about this game, it does not live rent free in my brain. I bought the promise of a space ship over a decade ago when there really was no game. The “game” then was here is your spaceship in a garage, stare at it and marvel. That was the whole game.

    Over time i’ve seen bits and pieces of it in my feed, I remember when they added being able to fly the spaceship, idk when that was, but again that was the whole game. You could see pretty space but still no substance.

    That was really my last experience with it because I think somewhere around this point is probably where I started working full time and stopped really following game news.

    Flash forward to today I see this post to see the game is still a work in progress, I shared my opinion.

    So if there is a decent game by now with a plot that would be great, I would give it a shot. But if it’s still just a fancy tech demo where you can run around for a bit but there’s really nothing to “do” then I’ll wait another decade.