3 ms·
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 whi
by Zikes 11y ago
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.
- pimlottc 11y agoPotentially clash; the commits may touch completely different parts of the same file without conflict.
- koreno 11y agoTrue that! My original idea was to somehow show the actual conflicts, but then I figured this gets the desired 80% for 2% of the effort...
- branchless 11y agoThis is the main prize. Using emacs + magit I can rebase and look at per commit files whilst having a buffer open to re-order commits. In fact magit could probably do some of this with a hook on reordering commits which would not require more git metadata. I'm not sure I care about any of this though as if I do rebase, reorder and then hit a conflict I can't resolve I can always abort the rebase.