[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Fix error messages in website build (issue4428077)

From: Carl Sorensen
Subject: Re: Fix error messages in website build (issue4428077)
Date: Fri, 6 May 2011 19:13:46 -0600

On 5/6/11 7:03 PM, "address@hidden"
<address@hidden> wrote:

> woah, this is confusing.
> Could go back to the 2nd draft patch, yesterday's version?  That is a
> very nice, self-contained patch.  I'd like to have the official review
> period and get that pushed.
> I have no reason to believe that the other changes are bad; I just think
> that they're premature, and that we lose clarity by including them in
> this commit.
> You can^h^h^h^h^h^h^h^hOne can very easily get the previous draft,
> without losing the later work, in git.  I'm not certain how to do it
> myself, though (I would begin by googling for tips), so I'm hesitant to
> offer to guide you through it.  But it'll be a one- or two-line command,
> that a knowledgeable person can bash out in 30 seconds or so.

You can use git stash (which I don't fully understand and have never used).

But I'd recommend something like the following:

git branch -f new-version
git checkout new-version

git checkout master
git reset --hard <sha1ID of the old version>

This will set your master back to the old version, and will create a new
branch new-version that will be sitting there waiting for you to do further
work on it.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]