From: Nicholas Wieland <nicholas.wieland@gmail.com>
Date: Tue, 02 Dec 2008 20:09:45 GMT
Subject: Re: Overwrite master
Message-ID: <67A24C29-12A6-43B0-95D5-70910C5F8841@gmail.com>
In-Reply-To: <eaa105840812020832p395ecefdq57e62f95182a3557@mail.gmail.com>

Il giorno 02/dic/08, alle ore 17:32, Peter Harris ha scritto:

> On Tue, Dec 2, 2008 at 11:10 AM, Nicholas Wieland wrote:
>> Hi *,
>> I need to overwrite my master branch with another branch. I've  
>> already
>> created a backup branch of my master.
>
> While on master,
> "git reset --hard <newbranch>"
>
> Or while on a different branch,
> git branch -D master
> git branch master <newbranch>

That's what I tried.
Unfortunately I don't know where to go after:

ngw@slicingupeyeballs ~/zooppa$ git commit
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 444 and 25 different commit(s) each, respectively.
#
nothing to commit (working directory clean)

Do I have to push ? If I pull it tries to merge ...


Thanks a lot for your time,
   ngw