Discussion
Loading...

Post

Log in
  • About
  • Code of conduct
  • Privacy
  • About Bonfire
satobi
satobi
@satobi@burningboard.net  ·  activity timestamp 22 hours ago

Do you sqash commits when you merge to main?

We always kept the full history but i think it is a bit messy for an overview how main changed. Especially if i want to know what changed between two MRs/PRs.

What are your arguments to do it like you do?

#development #git #python #java #javascript #go #rust

  • Copy link
  • Flag this post
  • Block
Andrew Graves :arch: :linux:
Andrew Graves :arch: :linux:
@graves501@fosstodon.org  ·  activity timestamp 22 hours ago

@satobi

IMO it only gets messy if the individual commits/commit messages are messy. Writing meaningful commit messages takes some discipline. So no, I don't squash since I see it as part of the documentation.

The "conventional commits" approach definitely helps: https://www.conventionalcommits.org/

  • Copy link
  • Flag this comment
  • Block

BT Free Social

BT Free is a non-profit organization founded by @ozoned@btfree.social . It's goal is for digital privacy rights, advocacy and consulting. This goal will be attained by hosting open platforms to allow others to seamlessly join the Fediverse on moderated instances or by helping others join the Fediverse.

BT Free Social: About · Code of conduct · Privacy ·
Bonfire social · 1.0.2-alpha.34 no JS en
Automatic federation enabled
Log in
Instance logo
  • Explore
  • About
  • Code of Conduct