3

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

Improve this question
0

1 Answer 1

Reset to default
3

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.

Improve this answer
Sign up to request clarification or add additional context in comments.

Comments

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.