Commit b1d85f3
authored
fix(CL): Apply changed files to generate a new target head && add conflict file comment (#1840)
* fix(CL): Apply changed files to generate a new target head && add conflict file comment
Signed-off-by: Ruizhi Huang <231220075@smail.nju.edu.cn>
* fix code review
Signed-off-by: Ruizhi Huang <231220075@smail.nju.edu.cn>
---------
Signed-off-by: Ruizhi Huang <231220075@smail.nju.edu.cn>1 parent 12ed33b commit b1d85f3
1 file changed
Lines changed: 255 additions & 140 deletions
0 commit comments