例如
$git checkout crp-5
$git rebase 5.x
Auto-merging hq-web/src/main/webapp/admin/config/ViewEscalation.jsp
CONFLICT (content): Merge conflict in hq-web/src/main/webapp/admin/config/ViewEscalation.jsp
Failed to merge in the changes.
Patch failed at 0012 escalation script action
$vi hq-web/src/main/webapp/admin/config/ViewEscalation.jsp
其中
<<<<<到 ======部分是5.x版本的内容
=====到>>>>是crp-5版本的内容
妥善处理后,例如删除5.x部分后
$git rebase --continue