cli: hint for conflicted branches and change ids

cli: hint for conflicted branches and change ids #6528