Re: Commited to wrong branch

From: Howard Miller <howard@e-learndesign.co.uk>
Date: Sep 15, 2009, 13:12 UTC
Message-ID: <26ae428a0909150612i3a24c968h33757594f16995a8@mail.gmail.com>
In-Reply-To: <20090915130640.GC31846@atjola.homenet>

Please stop what?

Ok... thanks for all your help guys but I'm giving up. A silly mistake has wasted a day. It shouldn't be like that. I appreciate that it's me that doesn't know enough about the way git works but I don't want to know. I don't have time - I have actual work to do. It'll be quicker to recreate the code I have lost.

Git encourages one to be experimental and create branches and stuff all the time which is great but doesn't do enough to stop one getting completely confused. That's how it feels to me anyway. Yes I am in a sulk - sorry :-)

Howard

2009/9/15 Björn Steinbrink <B.Steinbrink@gmx.de>:

Show 25 quoted lines

> [Please stop top-posting...]
>
> On 2009.09.15 13:58:32 +0100, Howard Miller wrote:
>> Got as far as applying the temporary patch and I now get a load of...
>>
>> Reversed (or previously applied) patch detected!  Assume -R? [n]
>> Apply anyway? [n]
>> Skipping patch.
>> 1 out of 1 hunk ignored -- saving rejects to file
>> theme/onepointnine/local.css.rej
>> The next patch would create the file theme/onepointnine/local.css,
>
> Just don't use patch(1), there's no sane reason to do that, you're
> sacrificing all of what git can offer there.
>
> cherry-pick or format-patch + am -3 are simply much better. (Or
> "checkout -m" or stash + stash apply, if you're dealing with uncommitted
> changes).
>
> Björn
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>