I have a front-end project B , which is developed on the basis of project A . After the code management tool uses git, for a period of time, both project An and B move forward, and there is a partial conflict between An and B"s modified code. If B wants to bring in the change of A Synchronize, what should be done with the least amount of work?

currently using merge:

create a new branch New-A, to pull the latest code from project A to New-A, and merge New-An into B, but doing so creates a huge amount of conflicts, which is time-consuming to resolve, and you have to be very careful

I don"t know if you have a better way. It"s not limited to git,. Thank you. Thank you.