Git

I recently have been working with stacked PRs a lot which is a very common pattern if you are working in a big organisation. I will share the approach I take to ensure that I face the least resistance in terms of the dreaded merge conflicts while trying to rebase the stacked branches onto main after some of them get merged using a squash strategy. If anything I would add merge conflict resolution to the top of my list of things I hate when working on a collaborative project. The primary cause of why merge conflicts occur is: ...

When you are working in a large code base comprising of multiple micro services maybe in a single repository your work would require you to make progress on multiple features simultaneously. There comes in a lot of context switching which in git terminology means multiple branches. The flow can become cumbersome when you keep stashing and checking out. Let’s see how that looks like. What is the problem? Let’s say I am working on a long term new feature in my freshly checked out branch lakshyasingh/feature-python. Now I made some progress on the feature and its not yet fully ready some changes are still present in the working tree and not yet committed. ...

Good Commits Git commits are everywhere, and you might be generating more than 1k commits over a year. So it becomes crucial to understand that commit should be structured and created in a scalable manner. Why bother? Writing better commits can make the difference between your debugging session lasting 1 hour to a few minutes. With good commits, it’s easier for anyone to understand the progress of a project and get up to speed. ...