I do a lot of micro-commits as well, though I rarely find that other members of my team are doing the same, to the same files, at the same time. When that happ

I do a lot of micro-commits as well, though I rarely find that other members of my team are doing the same, to the same files, at the same time. When that happens, we look into if it's possible to do more frequent merges (fast-forward rebases through Gerrit, to be specific) of our smaller commits to master, so we don't accumulate too much in isolation. I find it helps reducing bugs as well, if two or more members are doing active work in the same area in that way, it's not good to be working in complete isolation as it just opens up for bugs because of incompatibility with the work going on in parallel.