3.x is out of sync with 2.x, there is a bunch of merge conflicts.
somebody who is familiar with the changes in 3.x should create a branch from 3.x, merge 2.x into it and solve the conflicts. if we do it that way, future branch syncs from 2.x to 3.x should work with fewer conflicts.
3.x is out of sync with 2.x, there is a bunch of merge conflicts.
somebody who is familiar with the changes in 3.x should create a branch from 3.x, merge 2.x into it and solve the conflicts. if we do it that way, future branch syncs from 2.x to 3.x should work with fewer conflicts.