> If not then I'll merge and then troubleshoot.  I think when we tell it
 
 >not to squash the commits, it brings in your entire commit history   
 >followed by a merge commit.   
  
 Ok, I went ahead and tried it.  It did exactly that.  The commits that make
up the merge are written to the log and credited to the person who actually
wrote and submitted them.  Then a commit appears at the end showing who 
performed
the merge.  I'm ok with that. 
  
 The trick is to make sure the "squash commits" option is NOT checked, because
that hides the details. 
 

Reply via email to