You can also resolve them in Visual Studio or VS Code, which shows a nice diff view. Example: Two developers edit the UserController.cs file — one renames a method, another changes parameters — a merge conflict occurs that must be resolved manually. 6⃣ What’s the difference between Git and TFVC (Team Foundation Version Control)?

Short answer: Feature Git TFVC Type Distributed Centralized History Full copy on each developer’s machine Stored on server Branching Lightweight and fast Heavier and slower Offline work Possible Needs connection Common use Modern DevOps projects Legacy TFS projects Example: In Git, you can commit locally even offline on a flight — with TFVC, you’d need… server ccess.

Explain a bit more

Git is now the default in Azure DevOps for flexibility and collaboration.

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.