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 wa...