Tell me what to do in this situation. I am not well versed in gita

Removing public_html/wp-content/plugins/shopify-ecommerce-shopping-cart/assets/css/styles.css.map CONFLICT (modify/delete): public_html/wp-content/plugins/amp/templates/archive.php deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/templates/archive.php left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/screenshot-5.png deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/screenshot-5.png left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/screenshot-4.png deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/screenshot-4.png left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/screenshot-3.png deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/screenshot-3.png left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/screenshot-2.png deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/screenshot-2.png left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/screenshot-1.png deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/screenshot-1.png left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/includes/class-amp-post-template.php deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/includes/class-amp-post-template.php left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/includes/class-amp-common-template.php deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/includes/class-amp-common-template.php left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/includes/class-amp-archive-template.php deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/includes/class-amp-archive-template.php left in tree. CONFLICT (modify/delete): public_html/wp-content/plugins/amp/.gitignore deleted in HEAD and modified in efaf22b684d3a3075fefabb1487dd4447463f10c. Version efaf22b684d3a3075fefabb1487dd4447463f10c of public_html/wp-content/plugins/amp/.gitignore left in tree. Removing public_html/wp-content/plugins/accelerated-mobile-pages/includes/options/redux-core/assets/css/vendor/elusive-icons/scss/elusive-icons.css.map Automatic merge failed; fix conflicts and then commit the result.
  • one
    That is written - fix conflicts. About resolving conflicts in bulk information and on the Internet in general, and on this site in particular - andreymal
  • four
    Judging by the mistakes it was not a push - Alexey Ten
  • What kind of people, well, one has already written how to do it correctly, thank you. And the second is fundamentally necessary to stand out, it became easier from the minus? - eugene_v

2 answers 2

You need to resolve conflicts. You have two kinds of files, for them conflicts are resolved differently.

The first is the pictures. With them, such a plan - to open, see. If the picture is correct, then ok, if not, find the right one (in your case it will be easier). After that, make git add <этот файл> .

The second is php files (and any other text files). Here you need to open them one by one in the editor and look for the line with seven equal signs. Above and below from this piece you will see the symbols <<<<<<< >>>>>>> . These symbols highlight a controversial point. You need to edit it with your hands to get the correct result (and only you know what the correct result looks like). And in the end of course make git add. Always make sure you don't leave pieces with ======= (that is, the conflict itself).

There may also be files that were deleted as a result of merge (they are in git status) and are marked. If you agree with this, simply agree with this by executing git rm <имя файла> .

When all files are processed and added (git status will prompt), you can commit as usual.

An example of how to fix conflicts .

  • I did, xs, did not work. I searched yesterday in the internet, tried to solve it, but after all the failures I had to go here. Now I will try again. - eugene_v
  • In general, I solved my problem, updated the contents of the question - eugene_v
  • @eugene_v Answers - in answers: you do not need to update the contents of the question, you just need to write your answer, maybe someone will come in handy. - AK ♦

Solved the issue in this way:

git rm --cached. -r

git reset --hard 988634c

git push origin HEAD --force

I returned to the previous commit, where everything was fine, and after that I did everything right

  • For universality: instead of specifying the exact commit, you can use HEAD, HEAD ~ 1, HEAD ~ 2, and so on. Secondly, --force not always acceptable in teams. Thirdly, Kovadim’s answer is more correct and universal, but if that’s what helped you, you can check in two days later. - AK ♦
  • one
    Yes, I’m generally violet, I wrote at the beginning of the question that I didn’t really understand the geetah, secondly I don’t sit here for days and forgot that I can answer my own question. And then they began to throw eggs. What is the point of criticizing a person and making comments if you can just give a hint? Or is it easier to live? Under the answer of Kovadim, I wrote what I was doing already, as he wrote, my question was not solved in this way - eugene_v