If the list is extensive, you can format the output with the same decorative options that are available to the git log command. If a conflict occurs, the developer will have an opportunity to edit the ...