Today I was working on an issue Branch and got an error message saying this branch has conflicts that must be resolved. After clicking the Web Editor hyperlink:
The statement below, between lines 9 and 11, is the code I wrote in bug Fix Branch:
Two lines of code, 12,13, were introduced by others in the develop branch.
All you need to do is merge these three lines of code on this page, and remove all the <, > and = special symbols, which means that the branch conflict has been handled.
More of Jerry’s original articles can be found in “Wang Zixi” :
