[Top][All Lists]

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

Re: [O] getorg.sh script

From: suvayu ali
Subject: Re: [O] getorg.sh script
Date: Thu, 28 Jul 2011 23:50:35 +0200

Hi Jude,

On Thu, Jul 28, 2011 at 11:39 PM, Bernt Hansen <address@hidden> wrote:
> If that happens and you get a conflict you don't know how to deal with
> and you're willing to reedit your Makefile changes (which you would have
> to do anyway if you get a fresh clone) then you can just nuke everything
> with
> $ git checkout master
> $ git reset --hard origin/master
> and then redo your Makefile changes instead of recloning.

If you are willing to commit your changes to the Makefile in your local
repository you can do this:

$ <edit> Makefile # here master = origin/master
$ git commit -i Makefile -m "My changes" # master = origin/master+1
$ git pull --rebase --stat


Open source is the future. It sets us free.

reply via email to

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