命令合并代码

STEP 0:
回退代码
svn revert --recursive .


STEP 1:
svn up --username caohuiling652
svn merge https://caohuiling652@10.18.2.11/svn/PABank_iOS/branches/PAEBank_11 .

'''
Conflict discovered in 'PAEBank.xcodeproj/project.pbxproj'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p <==
'''


STEP 2:
显视冲突
svn st


STEP 3:
用客户端处理冲突


STEP 4:
svn resolved PAEBank/公共模块/公共界面/PAOperationsAlertView.h