Resolving Conflicts Locally — Roadmap Step & Resources
Reading conflict markers, choosing the right resolution and completing the merge
Open on Cached Info