search

sei-ec-remote / team-project-issues

0 stars 0 forks source link

Pull request issue where there are conflicts #162

Closed WahidSiddiqi closed 12 months ago

WahidSiddiqi commented 1 year ago

I have a pull request, but there is a conflict. It tells me to resolve the conflict before merging.

asands94 commented 1 year ago

You should resolve the conflicts, then try merging again. In VSCode, it should highlight the files that are causing issues and who you what changes to make.