Branching and merge conflicts

Working in feature branches is another common scenario. It's rare to code directly against master. Usually developers will create a branch, make their changes, and then merge the branch back into master.

  • Create a new branch called "description_fix"

  • Modify the description in the "index.html" file

  • Switch back to the master branch

  • Change the description meta tags in the "index.html" file

  • Merge in the "description_fix" branch

  • Resolve merge conflicts with VS Code

  • Push changes to Github

Last updated