When I use egit to submit my own code, I always find that there are conflicts when pushing. After checking the information, I submit the push in order:
Commit locally modified code;
fetch remote code;
merger conflict code;
push the code after conflict resolution;
I don’t know if the above order is correct, and how the specific egit operation of the third step of merge is done. Will eclpse automatically mark the conflict code in red after fetching? Thank you
欢迎选择我的课程,让我们一起见证您的进步~~