git status 出现.orig文件解决办法：
On branch develop
Your branch is ahead of ‘origin/develop’ by 199 commits.
(use “git push” to publish your local commits)
#
Changes to be committed:
(use “git reset HEAD …” to unstage)
#
modified: aa.php
#
Untracked files:
(use “git add …” to include in what will be committed)
#
bb.php.orig
- rm bb.php.orig
2.
git add bb.php
git add aa.php
git commit -m “解决冲突”
git status
On branch develop
Your branch is ahead of ‘origin/develop’ by 316 commits.
(use “git push” to publish your local commits)
#
nothing to commit, working directory clean
