2024-02-23 - Source Control History - Chewing the Fat 📈

[GordonBeeming]

Hey SSW'ers

Let's talk about this rule!

https://ssw.com.au/rules/clean-git-history

[Freego1783]

Important topic!

Video was clear and concise.

I mainly use git merge, and there were cases when I squashed commits but I rarely use git rebase. I believe it depends on the projects and the people you're working with.

[PothieuG]

I have already used merge/squash/rebase on 3 different projects. I think the use of each depends on the guidelines and the preferences of the tech leader. Personally, I have a preference for merge; it's the one I use on a daily basis.

Otherwise, the explanations were clear in the video.

[BrookJeynes]

Video was clear. I tend to prefer squash + merge.

[ricksu978]

The video explained git merge vs git rebase.

It would be great to give a real world scenario where git merge or git rebase is preferred.

e.g.:
Company conducts code audit every year and git merge is used to preserve detail history.

[AntPolkanov]

I would say git rebase is always preferred unless you expect lot's of conflicts.

[leahy268]

Great video for explaining how the different methods work.
Generally I prefer squash + merge.

[AshAnil]

Great video. I prefer to squash and merge commits.

[isaaclombardssw]

Video was well explained. Definitely helped to clear up any confusion I had about the differences between those 3.

[YalalCakirSSW]

Awesome rules. I've used git merge so far, I can see many why people preferred squash as well.

[synnoveisabel]

Important topic and good video explaining the different options. I usually prefer squash merge, rebase can be handy when you have 1 commit you're working on and want the latest changes in your branch, but as soon as you have more than 1 commit I find it to be a bit of a hassle.

[Calinator444]

I loved the video. I ususally get confused as to why git rebase is necessary when git merge exists, but the video made it clear. Granted it's important to observe the trade-offs when using any method in git that irreversibly modifies your commit history.

[TobyChurches]

Great Rule + Video. I mainly use Git Merge but Its great to actually understand Git Rebase

[matt-goldman]

This is hands-down the best video I've seen explaining the differences between merge strategies!

An important topic and discussion. However, it glosses over the effort it takes to "maintain a clean git history". Sometimes you rebase and have countless merge conflicts. Sometimes you have to do a soft reset just to avoid them. Git is a PITA (no denying it's better than any of the alternatives), and I posit that far more time and effort goes into to "maintaining a clean git history" on the off chance that maybe one day you might need it, than would go into dealing with it as and when you need to.

TL;DR: squash commit ftw 👍

[drwharris]

100% agree

[sethdaily]

Informative video, and great to learn about SSW people's commit habits

[wicksipedia]

Linear commit history or GTFO!

#StrongOpinionStroglyHeld

[chrisschultzssw]

Good stuff, I didn't really know the difference between squash/merge/rebase before.
My git usage is pretty simple, but I'm sure this will be useful to me one day.

[KristenHu]

I hardly use squash, it's clear but I would like to see the detailed git history, so I may still prefer git merge or git rebase.

[sylhuang]

Great video and very clearly explained with all the animation. During my work I found that git merge is most easy to use in case of conflicts. And in case of accidental push to remote, git rebase is hard to fix.

[tino-liu]

Most of the time it's git merge for me. But will look into it more in my personal project to really understand the difference between merge and rebase.

[AttackOnMorty]

My preference:

• Conventional Commits
• git merge to resolve conflicts (Use continuous integration to reduce conflicts)
• squash merge to main

[Aibono1225]

Clear explanation in the video. Personally I prefer squerge

[drwharris]

Im a squerger!

[JeanThirion]

Squash all the way

[cvionnet]

Nice explanation. Team squerge.

[Ben0189]

That is the channel i use to learn about system design, great to have more understanding about squash merge

[jimmidier]

Squash merge is usually the preferred way to avoid any "WIP" commits

[kenzengssw]

Nice video, it definitely taught me a few things. I usually rely on git merge the most, but this knowledge will be incredibly useful.

[jakebayliss]

Usually squash commits but need to play around with rebase more. Neat little video

[andrewwaltosssw]

Great vid + rule. Mainly used squash commits. Also liked to see PBI identifier (e.g. Jira number) for the task included in the squash or regular commit message to be able to easily see the context of the change where the PBI platform is different to the git platform (e.g. Jira + AWS CodeCommit 🤮)

[babakamyljanovssw]

Great video and rule that clearly explained git merge and git rebase. I've used git merge so far, and it gives full history of changes that can be valuable to track project development in most cases. Need to play with git merge and git rebase on personal projects to fully understand and see in which scenarios both of these commands suits.

[jackreimers]

Good video that covers the basics with helpful graphics.
I usually prefer to squerge