git代码摩擦

git代码冲突

<<<<<<< HEAD        sb.append("SELECT ID_, TIME_, USER_ID_, TASK_ID_, PROC_INST_ID_, FULL_MSG_")          .append(" FROM ACT_HI_COMMENT WHERE TYPE_ = 'comment' AND ");=======        sb.append( "SELECT ID_, TIME_, USER_ID_, TASK_ID_, PROC_INST_ID_, FULL_MSG_")          .append(" FROM ACT_HI_COMMENT");        if (processInstanceId != null) {            sb.appendCondition("PROC_INST_ID_ = ?");            argList.add(processInstanceId);            argTypeList.add(Types.VARCHAR);        }>>>>>>> 流程服务优化及新增失败JOb列表展示

?<<<<<<<HEAD和=======是冲突在HEAD部分的内容