How to Keep Branches Up-to-Date and Resolve Merge Conflicts in GitHub and VS Code

> Hey {username}, we’ve merged a PR before yours. Please resolve the merge conflicts so we can review and merge your PR. Have you ever received that kind of message from a maintainer while waiting for your pull request to be reviewed and merged? And then, you’re panicking because you