I Have a case where we are Three Developer working on existing project all have Different role to work on the code
1st Developer working on Current Task, 2nd working on bugs and all, and Third is Redesigning Code but once we start merging we are getting too many conflicts, and its taking too much time to merge so we have to do it manually at last.