mergeconflicts.md

title	subtitle	styleid	author	subsection	step	tags
Merge Conflict Detection	Avoid Merge Conlficts by being notified of conflicts as they appear in real time.	main-nav	sunny	VS Code JetBrains Android Studio	eleventh	setup instatallation admin permissions