GitHub now allows developers to resolve merge conflicts directly in the web interface with one-click buttons. When a pull request has conflicts, users can choose to accept incoming changes, current changes, or both without leaving their browser. This feature brings the convenience of code editor merge tools like those in Visual Studio Code to the GitHub web workflow, eliminating the need to switch contexts or use local development environments.