• 0 Posts
  • 15 Comments
Joined 8 months ago
cake
Cake day: February 13th, 2025

help-circle




  • The point is that when we look at what this God supposedly created, they’re clearly enthusiastic about all kinds of wild spectrum of sexuality.

    On days when I entertain the possibility of an infallible text, I’m not so sure I got the exact right version that I’m ready to deny someone else’s lived experience. I would have to be incredibly sure to be willing to gaslight someone else.

    On more frequent days when I don’t subscribe to an infallible text, I find it pretty clear that God created and adores all kinds of wild sexuality, and their message to humanity suffered badly under some seriously bigoted editors.





  • Is it ok to continue on a branch if you also merge back main into it?

    On some repositories, sure.

    But better maintained repositories don’t allow merge commits (because merge commits suck), and so will have squashed (or rebased) on merge.

    (If squashed) The squash will have changed commit IDs, so a long running branch rebased won’t benefit from a clean shared commit history.

    So it can work, but “you’re gonna have a bad time.”

    In general, git works best if branches are thrown away as soon and as often as possible.

    (Edit: Good clarification in response below, added here for consistency and accuracy.)