When I code at work using version controls, I often face git conflict situations. Every time I face them, I feel like “Oh… I did it again… (and I’ve kinda seen this before…)” Then I google while panicking, do some random things that I find on Google, and somehow, the…