Help needed with Git

[Ankit Agrawal]

Hi everyone,

         For this PR <https://github.com/scikit-image/scikit-image/pull/505>, 
I was trying to rebase but messed up my local repository because of my 
noobness with git. My complete log can be viewed here<http://pastebin.com/yTpe78M6>. 
Probably Stefan got busy over the past two days and hence could not reply 
to my last query in the discussions of the above PR. It would be great if 
someone here could guide me resolving my repo. If a chat medium seems 
convenient for you to guide me through this mess, I am available on IRC 
channel #skimage. Thank you.

Regards,
Ankit Agrawal,
Communication and Signal Processing,
IIT Bombay.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/scikit-image/attachments/20130605/40601d3c/attachment.html>