R
Riya Malhotra
@riya_code · 12 hours, 22 minutes ago

Git merge conflicts

Just spent 2 hours resolving a massive git merge conflict because my teammate formatted the entire codebase with Prettier before pushing.

Pro tip: ALWAYS set up Husky and lint-staged so everyone formats code on commit, not randomly once a month.

Comments (2)

Join the Conversation

Log in to leave a comment and interact with this post.

Log In

Comments (2)

A
anjali.js
12 hours, 16 minutes ago

Have you tried looking into the official docs? They recently updated that section and it's much clearer now.

S
sneha_builds
12 hours, 16 minutes ago

100% this. We switched to this approach at my internship and it solved so many issues.

No more comments.