807
Well well well. (lemmy.ml)
submitted 1 year ago by to c/programmer_humor@programming.dev
130 comments fedilink hide all child comments
 

Yeah learned this the hard way.

you are viewing a single comment's thread
view the rest of the comments
[–] 4 points 1 year ago (14 children)

... and force push.

If you ever find yourself in a situation where rebase or a force push seems to be the solution, take a step back, clone your repo in a new directory and copy the changes into you're new checkout - 'cause you gon' and screwed somethin' up, son.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 14 child comments
    •
  • [–] 19 points 1 year ago (6 children)

    I rebase and force push daily. I like squashing all my commits, and our main branch moves quickly so I rebase off that often. Zero issues for me.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 6 child comments
    •
  • [–] 7 points 1 year ago (3 children)

    Same. And even if you were to fuck up, have people never heard of the reflog...?

    Every job I've worked at it's been the expectation to regularly rebase your feature branch on main, to squash your commits (and then force push, obv), and for most projects to do rebase-merges of PRs rather than creating merge commits. Even the, uh, less gifted developers never had an issue with this.

    I think people just hear the meme about git being hard somewhere and then use that as an excuse to never learn.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 1 point 1 year ago (2 children)

    Why would you want to squash? Feels weird to willingly give up history granularity...

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 1 point 1 year ago (1 child)

    Because a commit should be an "indivisible" unit, in the sense that "should this be a separate commit?" equates to "would I ever want to revert just these changes?".

    IDK about your commit histories, but if I'd leave everything in there, there'd be a ton of fixup commits just fixing spelling, satisfying the linter,...

    Also, changes requested by reviewers: those fixups almost always belong to the same commit, it makes no sense for them to be separate.

    And finally, I guess you do technically give up some granularity, but you gain an immense amount of readability of your commit history.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 1 point 1 year ago

    Huh. Never thought of it that way. I was never bothered by a long commit history at all. Search and filter tools in the git client always get me where I want.

    The one issue I have is when there are way too many extant branches and the graph takes up happy half my screen.

    But that's more of a Fork issue than it is a fundamental one. The Fork dev could conceivably find a solution for that.

    Either way, I guess I see what you mean. I'm just not that strict about commits. Commits just for the linter aren't a thing since we have a pre-commit hook for that, and typo-fixing commits... Well, they happen, but they're typically not numerous enough that I'd find them to be any sort of issue.

    As for whether I'd really want to revert a particular change -- while I work, yes. Afterwards, I see what you mean; i could probably squash 50 commits into 15 or something. But when I think about the time investment of reviewing every commit and thinking about how they ought to be grouped together before making my merge request... I have a lot of trouble convincing myself it's a good time investment.

    Maybe I'd think otherwise if we had a huge team. We have maybe 10 devs on this project at any given time.

  • permalink
  • fedilink
  • source
  • parent
  • [–] 3 points 1 year ago (1 child)

    Yeah, I hate it when my repo is a chain of merge commits. I want to see actual changes to the code, not branch management history.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 2 points 1 year ago

    I'm the opposite. I just let git take care of the stupid content. Why mess with the commit graph? Merging locally (instead of squashing) works better with merge requests because the graph clearly shows what changes went where.

    I do some branch maintenance on my local branch (rebasing) until there are conflicts, but other than that I don't see any benefit for messing with commit history.

  • permalink
  • fedilink
  • source
  • parent
  • [–] 1 point 1 year ago

    Hmm, I'm less afraid of force push. It does what it says on the tin. If I pushed a fuck-uo to remote and a reset is the simplest way out, you can bet I'm force-pushing that reset.

  • permalink
  • fedilink
  • source
  • parent
  • [–] 1 point 1 year ago (2 children)

    A few days ago I had to gently explain to someone why their rebase-and-force-push strategy not only prevented the use of "review latest" feature on GitHub, but was also pointless because all PRs are squash committed to main.

    They didn't get it and now they seem a little mad at me.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 2 points 1 year ago (1 child)

    I'm guessing this is in reference to a scenario where a review of the PR has already been performed, and the rebase+force push is made to introduce new changes to the PR, possibly to address PR feedback.

    I agree that these changes should be made in separate commits, for the benefit of the reviewer.

    There are other scenarios where rebases are appropriate though, such as getting potentially incompatible changes from the main branch into the PR, and here I believe a rebase+force push is the right tool for the job.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 2 points 1 year ago*

    Oh there's totally a time and place for rebase strategies, this just wasn't one of them.

    Git's biggest problems come from
    people taking ritualistic views on what is "right" instead of thinking about which strategies work best for the situation, project, and team.

  • permalink
  • fedilink
  • source
  • parent