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
[–] 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