On Thu, Jun 02, 2011 at 11:43:19AM +0100, Howard Miller wrote: > Hi Tim, > > Thanks for the lengthy post :) As I said in my previous post, I > think/hope I have resolved it. I did read the manpage first (I'm not > so brave not to before posting here!!) and it did what it said it > would. I just misinterpreted it. A final merge was required. I > actually picked that up from the "Pro Git" book page which mentions > that extra step. Well, I'm confused, but that'll be due to my ignorance. As long as you're sorted out. As for the manpage, though, as someone who read and misunderstood it, do you have any suggestions for its improvements? Tim -- () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments
Attachment:
signature.asc
Description: Digital signature