2

What is the best way on resolving git conflicts with composer.json and composer.lock .

I have two extensions created from master installed through composer , one is approved to be merge , the other extension got the approved later on to be merged but while synchronizing files of master in the second extension got conflicts on those 2 files composer.json and composer.lock .

Im using git, bitbucket , phpstorm for this . Is there any fix on this (i don`t want to delete that branch and create a new one from master and install the second extension again. I want to fix the conflicts. ) ?

  • 1
    Can you show the conflict log so that we can investigate what is wrong? – Rendy Eko Prastiyo Nov 6 '18 at 2:20
  • Managed to fix it . Thank you @RendyEkoPrastiyo – Ylgen Guxholli Nov 6 '18 at 7:59
  • HOW CAN I REACH YOU PERSONALLY VIA EMAIL, TWITTER..ETC. WANT TO DISCUSS WITH YOU SOME MAGENTO COLLABORATION. ME IS GEORGE, GEORGELAU63@GMAIL.COM – gcplau Nov 9 '18 at 8:21
0

Managed to fix the problem by comparing composer.lock and composer.json that has conflict with the composer.lock and composer.json of master. Took the rows i need to commit . Did a git push and now the conflict is gone .

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy

Not the answer you're looking for? Browse other questions tagged or ask your own question.