this post was submitted on 11 Feb 2024
56 points (93.8% liked)

Programming

17384 readers
564 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

founded 1 year ago
MODERATORS
snowe@programming.dev
Ategon@programming.dev
MaungaHikoi@lemmy.nz
56
RelaGit: First Beta Release now available to download. (git.rela.dev)
submitted 9 months ago by TheCommieAxolotl@programming.dev to c/programming@programming.dev
23 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[โ€“] AnActOfCreation@programming.dev 2 points 9 months ago (1 children)

I've been trying to explain to someone recently why rebasing and force pushing their feature branch has no benefit when we use a squash commit strategy for merging to main.

While you're 100% right, is there anything wrong with this approach? Sometimes I like to keep by personal branches clean, especially before I open a PR.

[โ€“] killeronthecorner@lemmy.world 3 points 9 months ago

It depends on your intent. If you're doing it to keep history clean and linear in the long term, it's a huge waste of time as it gets splatted into a single squashed merge commit. It also makes it difficult for reviewers to rereview your changes as GitHub/Lab can't calculate the diff because you keep moving the goalposts with force pushes.

If you're doing it for cleanliness on your local branch then I guess that's fine, but I find it anti-social in a multi participant repo.