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

This article will explain in detail about git conflict resolution methods for everyone, Xiaobian thinks it is quite practical, so share it for everyone to make a reference, I hope you can gain something after reading this article.

git conflict resolution method: first in the project directory right-click, click on the two-way red arrow position; then select the file to modify the conflict, select merge tool; then merge the code; finally right-click again to select commit submit code.

GIT's way of resolving conflicts:

First of all, if there is a conflict in our file, the file will be displayed in red. Then we move the mouse over to the project directory and right-click and select team. This column contains the attributes and processing of git. Then select synchronize workspace.

After that, we will enter the conflict resolution interface. Then we click on the position of the double red arrow, which means to show all the conflicting files, so that we can more intuitively see some of the file conflicts.

3. Then select the file we need to modify the conflict, and then right-click, select merge tool, and then two code comparison interfaces will appear in the lower right corner. Remember that the code on the left is the latest server code, and the code on the right is your own code. At this time, you need to compare the server code with your code and save the changes on the left.

4. After saving, we select the conflict file again. Click the right mouse button and select add to index to merge the code.

5. After merging, right-click again and select commit to submit the code. Note that this process will be slightly longer when submitting the code again. After submission is complete we will find that the project will be pushed by arrows. When we see this arrow to push, it means the conflict has been resolved.

About "git conflict resolution methods" this article is shared here, I hope the above content can be of some help to everyone, so that you can learn more knowledge, if you think the article is good, please share it for more people to see.

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.