我想大声告诉你2017-05-02 09:30:24
Above and below the equal sign dividing line are two possible merge results. Git does not know how to choose, so a merge conflict occurs.
The simplest and crudest way is to manually edit the file, leave the part you want, delete those dividing lines, and then git add. You can also use some ready-made GUI tools to handle merge conflicts.
phpcn_u15822017-05-02 09:30:24
Use wenstorm merge, the gui interface is very easy to operate, just move everything to the middle
