CONFLICT (modify delete)冲突修复

 Demo git:(test) git merge feature
CONFLICT (modify/delete): path/to/path/config.inc.php deleted in HEAD and modified in feature. Version feature of path/to/path/config.inc.php left in tree.
CONFLICT (modify/delete): path/to/path/config_unter.php deleted in HEAD and modified in feature. Version feature of path/to/path/config_unter.php left in tree.
CONFLICT (modify/delete): path/to/path/global.php deleted in HEAD and modified in feature. Version feature of path/to/path/global.php left in tree.
Automatic merge failed; fix conflicts and then commit the result.
➜  Demo git:(test) ✗
➜  Demo git:(test) ✗ git status
On branch test
Your branch is up-to-date with 'origin/test'.
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

	modified:   path/to/path/global.php
	modified:   path/to/path/config_unter.php
	renamed:    9a23d27a315a22b482f10c06603ef228.php -> e420ed96a8d7493775ae8cfcbbc8f774.php
	modified:   path/to/path/global.php

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   path/to/path/global.php
	deleted by us:   path/to/path/config_unter.php
	deleted by us:   path/to/path/global.php