Comment Comment by Zikes Two commits touching the same file, represented by the identifier at the end of the rebase's commit line. If you look at each file as a column, you can see which commits would clash. parent Zikes 11 years ago