How to solve the conflict between the content of git dev branch and master branch

This article introduces the relevant knowledge of "how to resolve the conflict when the git dev branch content is merged into the master branch". In the operation of the actual case, many people will encounter this dilemma, so let the editor lead you to learn how to deal with these situations. I hope you can read it carefully and be able to achieve something!

1. Establish two branches, dev and master, on the project

2. Dev branch modifies README.md content

3. Master branch modifies README.md content

4. Switch to the master branch, as shown in the figure Team-Merge...,

After the conflict

After manually merging, right-click the conflict file Team- > Add to Index, and then Team- > Commit- > Commit and Push

5. Merge master branch content into dev

Switch to the dev branch, Team- "Merge, select master, and click the conflict file content that Merge,master just merged to update to the dev branch.

This is the end of the content of "how to resolve the conflict when merging git dev branch content into master branch". Thank you for your reading. If you want to know more about the industry, you can follow the website, the editor will output more high-quality practical articles for you!