Resolving Conflicts Locally — Study Resources & PYQs
Curated resources, past papers and PYQs for Resolving Conflicts Locally.
Study resources
- Oh Shit, Git!?! (Article) — A hugely popular, plain-language guide to fixing common Git mistakes including conflicts.
- How to Resolve Merge Conflicts Explained (Video) — A practical walkthrough of reading conflict markers and resolving them.