Resolving Conflicts

Reading conflict markers, rerere, and structuring code so conflicts are rare rather than easy.

1 article

Reading conflict markers, rerere, and structuring code so conflicts are rare rather than easy.

Intermediate6 minDraft

#git