I updated some classes for someone else's project and made a pull request. But there is a problem in the conversation: "This is a request for a request that contains a request for a conflict." How to solve it? And the author also writes in conversation: "Please merge from master first and I’ll accept the pull-request".

    2 answers 2

    You need to push the author's master branch, and kill the conflicts that have appeared. After that, make a merge commit and suggest a pull request. I'll give an example for tortoise git.

    1. Right click on the project directory> pull
    2. After the pool passes, a message appears stating that conflicts have been found, click the show changes button and review all the files marked in red.
    3. After selecting the "red" file, open it, a window divided into three parts of theirs , mine and final will appear. Find the red lines, and select the solution solution for theirs - leave this line as the author, mine - leave your line. After completion, click mark as resolved , and go through all the other files.
    4. When done, open the project again and make sure everything works.
    5. commit and push.
    6. Send pull request again.
    • I honestly do not understand. :) - compl
    • did as requested - Alexey

    Actually, do what they ask of you:

    1. go to the folder where you have your branch;
    2. remove new changes from the wizard;
    3. conflicts, if any, cut open;
    4. commit, push
    • Also did not understand what to do. Here is the link: github.com/b0noI/TicTacToe/pull/29 - compl
    • one
      @compl If you do not understand something specific, then say what it is. If you do not understand everything, then first read the instructions for using git from and to, and if you have questions, say. - Athari