Answers

Here are the answers to this chapter’s questions:

1. More frequent integration leads to easier integration because with smaller differences, there is less chance of conflict, and because conflicts are discovered earlier. It also makes it easier to maintain a production-ready mainline, decreasing the time it takes to put the feature into the production environment.
2. Using topic branches makes it easier to review and examine the steps it took to create a feature and remove it if needed. The use of topic branches also plays nicely with the requirement of pre-integration code review.
3. You can use the “orphan” branch trick – for example, with git checkout -- orphan – to have two or more unrelated histories in a single repository.
4. Log in to the other computer and use git pull; if this is not possible, you can git push into a non-bare repository (configuring what should happen to checked-out branches).