Addressing merge conflicts

As you and your colleague are building a one-page portfolio website, you both start updating the Skills section, but you accidentally make different changes to the same part of the web page. You are making changes to the title of a skill, while your colleague also updates the title, icon, and description:

Figure 6.6 – What I Do section of the portfolio web page

Merge conflict in action

Both you and your colleague pull the latest version of the website from the main branch to start your work. You update the title of a skill from React to Web Development, and at the same time, your colleague changes the title to Google Cloud Provider, changes the icon for the same skill, and modifies its description.

You both commit and push your changes to GitHub. You finished your work first and you pushed your changes to the main branch. After you, your colleague tries to push their changes. But now, GitHub alerts them of a merge...