Discussion on "How NOT to use Git in Practice. Ten Git usages, you should know to avoid."

Tapas Adhikary · 2021-07-12T03:38:19.920Z

Hello friends 👋. I hope you all are doing great and had a productive week learning something new. Today, we will discuss Git and a few usages, practices that you should avoid making your development experience a better one. What is Git, and How does...

A lot of this is subjective, depending on the organization and the project. These things are not set in stone and are not some holy rules that send you to Git Hell if broken. They're just guidelines for a sensible usage of Git in general but could be "not followed" in certain situations.

Also, as a fairly recent article it sounds outdated that you still call the main branch master when there's an active drive going on to rename it to main. :)

Great article. Thanks for sharing!!

Thanks, Tracy! Glad you found it helpful.

Great article, well explained. Tapas Adhikary,

Nice article, I would like to disagree with the "special master" point. I've been using trunk based development for several years and it is great:

trunkbaseddevelopment.com

Keep the good work! :)

Thanks Marcos 🙂.

Just curious, the trunk based approach you are using with git or with other VCS like SVN?

Hi Tapas Adhikary, yes it is git, with a small team of 5 devs. Being doing it for 7 years now.

We don't do formal reviews or PR's, all the code is produced on pairs or overviewed by a senior dev at coding time and commited to trunk.

We are full CI/CD using jenkins, and the simplification of the VCS model (git in our case), with low branching or other tasks, leads to more time coding.

Have yet to test the model at a scale, but it works nicely here.

Marcos Brigante Thanks for sharing, Marcos. With my team of 23, restricting master is the first thing we do 🙂. Great to know about your environment and usecase.

Great list, Tapas Adhikary. Thanks.

Would like to add a couple -

Always squash your commits w.r.t. Don't make it bulky section.
Do git pull --rebase when appropriate.

Thank you, Niranjan.

These two additions sound great. Thanks a lot for sharing 👏.

I tell to my teammate to always use "git pull --rebase" and to define a "pr" alias to make it short.

It should not be required if they follow the rule to never commit directly to a main branch, but there is always someone that does it by mistake and this prevents the creation of an unwanted merge.

Discussion

How NOT to use Git in Practice. Ten Git usages, you should know to avoid.

Responses(5)

Recent in Forum

Search Hashnode

How NOT to use Git in Practice. Ten Git usages, you should know to avoid.

Responses(5)

Recent in Forum