3 ms·
It will show them at the time they occurred, with an additional notation for when the rebase command recreated them. On the other hand, it will not show any co
by Rusky 10y ago
It will show them at the time they occurred, with an additional notation for when the rebase command recreated them.
On the other hand, it will not show any conflicts resolved during the rebase- it will just look like you knew all along what master was going to look like.