Got that colorchanging cup from my girlfriend. I love her and the cup, but.the indentation infuriates me

Software Engineer
Nerdious Geekius

The elusive Software Engineer is a nocturnal creature, rarely found at their desks before 10 or 11 in the morning, but often staying late into the night. They dislike being interrupted while at work, and it theorized that their penchant for twilight hours is an evolutionary adaptation to reduce breaks in their trance like state of coding.

Not surprisingly, Software Engineers are solitary creatures, except for occasional gatherings called "code reviews". In these gatherings, engineers gently pace around a clearing, sizing up each others work. Although occasional battles will erupt, they mostly end without injury and the engineer will retreat to their desk and continue to hibernate.

Fun Fact: Software Engineers have been know to kill each other in brutal fights over identation styles

I got 21 files with conflicts while merging feature to develop.
16 files were just identation and space shit conflicts. WHY do you commit reformats that change tab characters with spaces or vice versa without changing any code??? STOP WASTING MY TIME

Sometimes i feel really messy in my code and unorganized.
after a while i regret what i did and in order to fix this mess i re write the class all over again or i end in an endless errors which is time consuming.
So what's the best way to write a clean code in your opinion other than commenting and identation

Forget, "I'll make the identation and commenting once I finnished coding this". There is no such thing.