Re: git help - previous rebase directory

[Janek Warchoł]

2011/6/9 Graham Percival <address@hidden>:
> On Thu, Jun 09, 2011 at 07:37:51PM +0200, Janek Warchoł wrote:
>> By the way, is modifying patch files disallowed/generally bad idea?
>
> It's certainly not recommended.
>
>> I discovered that my patches introduce some whitespace errors and it
>> would be easier to correct the whitespace errors within the patches
>> rather than creating another commit. Will this confuse Rietveld?
>
> Correct the errors, then commit the changes, then merge those
> commits with:
>  git rebase -i origin/master
>
> I fix small errors like this all the time, and it hasn't confused
> reitveld yet.

Thanks for answers!

What about

2011/6/9 Janek Warchoł <address@hidden>:
> When i try to git am <patch>, git says
>
>   previous rebase directory /home/janek/lilypond-git/.git/rebase-apply
>       still exists but mbox given.
>
> despite that the current branch was deleted and created again.

?
I don't understand the above message. I get it when i try to apply any
patch to any branch - i cannot do anything until i fix it... or
recreate git repository from scratch.
Do you need more details?

cheers,
Janek