| commit | 1b4672c3f02bf35a88fc15c3621a49988c716efe | [log] [tgz] |
|---|---|---|
| author | Ian (Hee) Cha <heec@google.com> | Fri Mar 29 14:32:53 2024 -0700 |
| committer | GitHub <noreply@github.com> | Fri Mar 29 22:32:53 2024 +0100 |
| tree | 6c1dbf45076743d3f4ce2a4330efd82af8d3519b | |
| parent | 892481229c9d2449b219036b055d31588b6496a3 [diff] |
Specify which files had merge conflicts while cherry-picking (#1934) When cherry-picking, the bot issues a comment "Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually." But there can be an improvement for the users and specify which files had the conflicts.