We use a branching git workflow, but we have real issues with merge conflicts. None of us are git gurus so we always end up manually resolving the conflicts in an IDE which is error prone.
There has to be a better way? We have 4 teams, all with 5+ devs working in the same (very large) codebase.
We branch off master, do our work then open a PR to master when its done, but in the mean time another team could have a PR merged to master in the same code we were working on. Here we have to get latest of master, and merge it into our branch, resolve the conflicts (never easy) then push and then we can merge our PR to master.
Firstly - is there any easier way to deal with conflicts such as this. Secondly - would a forking flow help, and if so, how?