Conflict resolution is easy if you use the right tool. Do you use web storm or some other ide with à visual conflict résolution tool ?
Conflicts don't happen when you have a good architecture and everyone works in their own component. It also doesn't happen when you communicate and if you rebase often.
It's even easier when you don't have them in the first place. :-)
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.