L9 - Version Control 1

Question 1

What are the 4 functionalities a modern version control system supports? Define each…

Answer 1

Change Management: Quickly and reliably get any version of the file.

Branch Management: Diverge and combine work streams as needed in a conflict free way.

Build Management: Script activities to be carried out automatically during the build.

Collaboration: Teams across time zones and location can collaborate simultaneously.

Question 2

What are the 2 repo organisation types?

Answer 2

Mono-repo
Multi-repo

Question 3

Define Mono-repo

Answer 3

One giant repository for all microservices. Any commit triggers the production of multiple microservices.

Question 4

What are the pros and cons of Mono-repo?

Answer 4

• Pros:
  
  • Service code is visible and atomically changeable
  • Service code is reusable
• Cons:
  
  • Weak or Strong service ownership model must be chosen
  • Knowing what needs to be redeployed is hard

Question 5

Define Multi-repo

Answer 5

A one repo per service policy. Any commit triggers the production of the associated service.

Question 6

What are the pros and cons of Multi-repo?

Answer 6

• Pros:
  
  • Strong service ownership model
  • Knowing what needs to be (re)deployed is easy.
• Cons:
  
  • Service code is not all visible or atomically changeable
  • Service code is not easily reusable

Question 6

What are the 2 branching models that can be adopted when using Version Control?

Answer 6

Feature based development
Trunk based development

Question 7

Explain feature based development

Answer 7

Create new branches for each feature that needs to be developed. Branch is merged back to main upon feature completion.

Question 8

What are the pros and cons of feature based development?

Answer 8

• Pros:
  
  • Easy to build and manage multiple features.
  • Control over what is merged back into main branch, and when it’s merged.
• Cons:
  
  • Merge conflicts can be very complex
  • Expertise is needed to manage and merge branches

Question 9

Explain trunk based development

Answer 9

Developers work on a single, main branch. If any feature branch is created, it’s merged into the main within minutes.

Question 10

What are the pros and cons of trunk based development?

Answer 10

• Pros:
  
  • Avoids merge conflicts
  • Main branch is always production ready
• Cons:
  
  • Main branch is in a constant state of churn
  • Merge expertise are needed for the few merges that are needed