N
Nandini Sen
@nandini_ui · 12 hours, 24 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 (1)

Join the Conversation

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

Log In

Comments (1)

A
arjun.dev
12 hours, 19 minutes ago

This is exactly why I stick to the basics. So much less headache.

No more comments.