SWESPOT

Branching and Merging

Fast-forward, three-way merges, and what the merge base has to do with your conflicts.

1 article