> How does git make programmer A want to disentangle the fix? From experience, I'd say it makes the process of doing so easier. In git you can: 1. commit a po

> How does git make programmer A want to disentangle the fix? From experience, I'd say it makes the process of doing so easier. In git you can: 1. commit a portion of the code, even a portion of a single file using git add --interactive 2. stash your current changes, re-make the change needed, commit, then unstash and keep working > How does git keep Programmer B from making changes against the wrong base? Making it easier to move the fix is exactly the point. You can't make it impossible to make mistakes, but you can make them less disastrous. Also, you can easily revert the fix in the wrong branch or remove it entirely if you haven't shared your changes. > How does git make merging easier? I was too scared to make branches in other systems, but my guess is that rebase is a significant part of it. If you're rebasing fairly frequently the changes you're making shouldn't diverge too much, and it makes the actual merges trivial. You gain a lot from being able to manipulate the history of your repository. The unfortunate thing is that the history itself isn't version controlled, so you can't manipulate the history once you've shared it with other people.