Re: git rebase conflict help?

> I fetched my origin branch, then tried to run 'git rebase origin'.  
> one of my commits from master which is not yet in origin got a  
> conflict, so git rebase origin told me that the Simple cherry-pick  
> failed, and the Automatic cherry-pick got conflicts. and it saved the  
> commit message for me in .msg and my offending commit's id in .rebase- 
> tmp32409.
>
> I'm not sure how to proceed from here. actually, I know what the  
> offending changes are, and I could re-do the changes by hand and  
> commit them again, but I'd like to know what git tools I'm supposed  
> to use in this case...
>