How to resolve a pull request conflict?

Question

git

The conflict arose due to the fact that I did not update my forked repository.
But I don't know how to fix it.
There are no comments in the file with the conflict.
I made a pull to the master, and then uploaded it to module2-task1 - it doesn't help.
Maybe you've come across?

Answer 1

You need to do one of two
things 1) rebase your branch to the branch you are pulling the request to
2) merge to your branch of the branch you are pulling the request
to. does not create unnecessary garbage in commits.