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. ) ?