Re Git. My strong advice is to do trunk-based development. Always. No exceptions. Everybody does TDD. When the tests pass and the code is complete, check into trunk (both tests and code). 1/
When you check in a test, Jenkins (or your equivalent build manager) should automatically add it to a test suite that's run with every subsequent check in of the same code file. 2/
Branch-based development is a disaster. The resulting merge conflicts create bottlenecks, slow down your development, and make for huge tangles of incompatible code that can take hours (or days) to sort out. Just don't do it. 3/
Given Git's three-stage check-in process, there's no need for branches unless a single developer is working on multiple machines in different physical locations (which could happen if you're on the road). Those branches should be very temporary— destroy them after check in. 4/
In a normal situation, just don't commit local changes until you're ready (but add regularly). Push after every commit. Commit as often as you can (several times a day). And I must reiterate: always use TDD so that you never commit any code without tests. 5/5
