Questions
Answer the following questions to test your knowledge of this chapter:
- What are the advantages and disadvantages of using merge to integrate changes?
- What are the advantages and disadvantages of using rebase to integrate changes?
- How do we avoid resolving similar conflicts again and again during a merge or rebase?
- How can we discover whether we are in the middle of merge or rebase, and remind ourselves on how to resolve conflict or abort an operation?