What to read about the solution to the Pull Request merge conflict?

Question

git

Good afternoon,

what to read about this? Can you recommend some GUI programs (ubuntu) that help resolve conflicts?

good luck to everyone,
Vadim

Answer 1

Git 's documentation is excellent, everything is clear and in Russian.
In short: open the files where the conflict is, look for the comments of the git itself - choose what to leave, what to remove in your code. Delete unnecessary, along with the comments of the git itself. You end up with another commit.