Question

Minimize conflicts when merging code should be one of your goals while performing branching.

Answer 1

Branching is done to minimize conflicts when merging code.

There are 3 branching strategies :-

1) Branch by release -  Every release will have separate branch.

2) Branch by feature - Different branching for different user stories.

3) Branch by abstraction - This is a strategy there is single branch for every thing.