Shulou(Shulou.com)06/03 Report--

Let's first understand what conflict is. A conflict is when the code String str= "aaaa" is modified at the same time, one to become String str= "bbbb" and the other to become String str= "cccc"; this leads to conflicts when the code is merged. If the code merge is from the trunk rebase to the branch, if there is a conflict, it is based on the trunk (to ensure that the existing functions are not affected), then the backbone code will force the code to overwrite the branch. There are 4 files after the conflict (take the pom.xml file as an example):

1.pom.xml-the merged file, if there is a conflict

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.