摘要:
STEP 0:回退代码svn revert --recursive .STEP 1:svn up --username caohuiling652svn 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 阅读全文