How to Fix Merge Conflicts Before Creating a Pull Request

[trading-dojo]

Select Topic Area

Question

Body

I made changes in my branch feature-dashboard and tried to create a pull request, but GitHub shows a message saying “This branch has conflicts that must be resolved”. What should I do?

[alberto-debug]

This happens because your branch has changes that conflict with the main branch. To fix it:

Switch to your branch:

git checkout feature-dashboard

Pull the latest changes from main and merge them:

git pull origin main

Resolve any conflicts in the files shown by Git. After fixing them, stage and commit the changes:

git add .
git commit -m "Resolve merge conflicts with main"

Push your updated branch:

git push origin feature-dashboard

After this, your pull request will be conflict-free and can be merged safely.