Welcome to the repo. Abandon all merge conflicts, ye who enter here.
-
Don't commit merge markers (
<<<<<<<,=======,>>>>>>>) — resolve them first. -
Don't commit commented-out code. If it's not needed, delete it.
-
Don't leave TODO comments and ship them to main. Fix it or track it in an issue.
-
Don't commit debug logs (
console.log,print,System.out.println) — clean up after yourself. -
Don't commit IDE-generated comments or auto-generated boilerplate you don't understand.
-
Write meaningful commit messages. "fix stuff" is not meaningful.