Give an example of the more efficient conflict resolution command suggested by the version of the commit message that's mailed out as opposed to the more error prone version that will be suggested when doing the actual import.
Give an example of the more efficient conflict resolution command
suggested by the version of the commit message that's mailed out
as opposed to the more error prone version that will be suggested
when doing the actual import.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase