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

This article mainly explains "how to resolve Git conflicts in IDEA". The content of the explanation is simple and clear, and it is easy to learn and understand. Please follow the editor's train of thought to study and learn how to resolve Git conflicts in IDEA.

For seniors, the daily operation procedure of going to the company every day may be like this.

It's sunny in the morning, and it's a good time to knock on the code.

1) first, download the code submitted by other colleagues from the Git server

Or you can pull it like this.

2) pull down the colleague's code, and then merge the code

When merging code, the leftmost code is your own code, the middle one is used to view the merged results, and the rightmost code is the code on the Git server or colleague's code.

The code in the red area indicates that the codes of the two sides are in conflict. If you need the code in the red area, click > to integrate into the middle result area. If you don't need it, you can click the X number in the red area.

The code in the green area is code-free and can be directly merged with past applications.

Tips:

Git conflict: a conflict occurs when two parties write different codes in the same place.

After merging the required code, we can click the Apply button to apply it.

This is the result of the code merge, we can see that the code has been integrated, so that even if the conflict is resolved, we can start coding.

After completing the development of today's code, we need to run today's code. After the test has passed a specific implementation effect, we need to commit in the project first, and then pull it. If colleagues finish ahead of you, you will need to integrate the code again, then submit it and upload it to the Git server.

Daily operation procedure

Code update: pull operation to download the code submitted by other colleagues

Conflict resolution: concrete analysis of specific problems

Develop today (complete a function: coding, testing)

Submit code: submit, pull first (update project), resolve conflicts (merge), submit & push

Thank you for your reading, the above is the content of "how to resolve Git conflicts in IDEA". After the study of this article, I believe you have a deeper understanding of how to resolve Git conflicts in IDEA, and the specific use needs to be verified in practice. Here is, the editor will push for you more related knowledge points of the article, welcome to follow!

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.