How to Resolve Merge Conflicts in GitHub

Guide

1. Go to your current repository with existing conflicts.

2. Click on the numbers that you don't want to keep. Remember green colors are numbers that will be deleted and the blue colors are the numbers that will remain.

3. This file also has a conflict but you can just uncheck the file and click on the 'Discharge Changes' option.

4. Click on the 'Discard Changes' button.

5. Once you're done, click 'Commit to master'.

6. Click on the changed file and click 'Discard Changes'.

7. Click on the 'Discard Changes' button.

8. Click on the 'Push origin' to save the changes.

9. Click 'Open this repository'.

10. Open the file and check everything.

11. That's it! By following these steps, you can resolve merge conflicts in GitHub.