1

I'm new to Git and using GIT Desktop to pull and push code. I got this error while I was pulling code from the repository. I got this error how can I resolve it As shown in give screenshot

Abdul Rehman
  • 99
  • 1
  • 1
  • 7

1 Answers1

2

Looking at the docs, there are 2 ways of Addressing Merge Conflicts.

I am not sure if they can be also implemented through GitHub Desktop.

Kostas
  • 81
  • 1
  • 4
  • 7