Git will highlight the conflicts in files like this:?

Short answer: <<<<<<< HEAD old code ======= new code >>>>>>> feature/login

Real-world example (ShopNest)

Azure DevOps holds ShopNest repos, boards, and release pipelines in one place so build + deploy stay repeatable.

Say this in the interview

1. Define — one clear sentence (the short answer above).
2. Example — relate it to a project like ShopNest or your real work.
3. Trade-off — when you would not use it.