Stack Exchange network consists of 183 Q&A communities including Stack Overflow, the largest, most trusted online community for developers to learn, share their knowledge, and build their careers.
Linux user since 1994. Main programming language: C. Now for the last years mainly working with Angular/Typescript and C#. AT command wizard. Quite proficient with git.
And speaking of git
you should use git test to test every single commit on your branches.
when you get conflicts, use a proper 3-way merge tool like KDiff3 to resolve those.
Excellent videos that every developer should watch: