Solving conflicts in Magento's config.php
This blog post was published more than one year ago and might be outdated!
· One min read
Sometimes you run into this situation when a git pull will respond with Merge conflict in config.php. How to solve this issue in a proper way? Let's have a look how other people solve similar issues, namely my friend Mr. Rafael Dohms. Quite a while ago he blogged about a similar problem on how to solve conflicts in Composer's lock file. This is what I learned from his blog post:
First get the other developers changes:
$ git checkout origin/master -- app/etc/config.php
Replace origin/master with whatever remote and branch you are pulling from. Then simply replay your changes on top of this, like:
$ bin/magento setup:upgrade
Problem solved :)