How to Resolve Conflicts in GitHub

Quick summary

This demo walks you through how to resolve merge conflicts in GitHub Desktop by choosing which changes to keep, discarding unwanted edits, and pushing a clean commit to your repository. It covers the full conflict resolution workflow from opening a conflicted repository to verifying and pushing the final changes.

Steps

1. Go to your current repository with existing conflicts.
2. Click on the conflicting line numbers you don't want to keep — choose which changes to keep or combine them manually.
3. For a file with a conflict you want to remove entirely, uncheck the file and click the Discard Changes option.
4. Click the Discard Changes button to confirm removal of the unwanted file changes.
5. Click Commit to master to save your resolved conflict as a new commit.
6. Click the changed file and select Discard Changes to remove any remaining unwanted edits.
7. Click the Discard Changes button again to finalize the removal.
8. Click Push origin to upload and save all resolved changes to the remote repository.
9. Click Open this repository to verify the resolved state in your file browser.
10. Open the file and check everything to confirm the conflict resolution is complete.
11. After resolving conflicts and pushing changes, test the functionality of your code to ensure everything works as expected.