• 0 Posts
  • 10 Comments
Joined 2 years ago
cake
Cake day: July 29th, 2023

help-circle
rss



  • I would advocate for using each tool, where it makes sense, to achieve a more intelligible graph. This is what I’ve been moving towards on my personal projects (am solo). I imagine with any moderately complex group project it becomes very difficult to keep things neat.

    In order of expected usage frequency:

    1. Rebase: everything that’s not 2 or 3. keep main and feature lines clean.
    2. Merge: ideally, merge should only be used to bring feature branches into main at stable sequence points.
    3. Squash: only use squash to remove history that truly is useless. (creating a bug on a feature branch and then solving it two commits later prior to merge).

    History should be viewable from log --all --decorate --oneline --graph; not buried in squash commits.




  • I feel the same about Mastodon. I just want to be social with my friends, not on broadcast to a bunch of randos. It makes sense for brands and I guess people who commercialize their identity. But I don’t really care about trying to keep up with the lives of brands or really people i don’t know, so i haven’t want or need for such a site. Also I prefer to catch up with someone for real. Like tell me what you did when we hang out next. I don’t want to sit there and pretend like your trip to wherever is news because i already casually saw all the pictures you posted a month ago. And if we are never going to meet again, then I don’t need to know what you do with the rest of your life. I like this format much better. Ego is much less in effect and people can just bounce ideas and jokes around. Reddit though… most of the user base is still over there. I’ve stopped posting and voting entirely. Full lurk mode.