[Top][All Lists]

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

Re: [O] getorg.sh script

From: Bernt Hansen
Subject: Re: [O] getorg.sh script
Date: Thu, 28 Jul 2011 17:39:25 -0400
User-agent: Gnus/5.110018 (No Gnus v0.18) Emacs/23.2 (gnu/linux)

> On Thu, 28 Jul 2011, Bernt Hansen wrote:
>> In what situations does org-mode update fail?  I've never had to reclone
>> the org-mode repository - ever.  If git update fails, just do it again.
>> Recloning means you need to download all of the objects for org-mode
>> again which should never be necessary.
>> If you've messed up your local master branch somehow and want to revert
>> back to the official 'master' branch then just
>> $ git checkout master
>> $ git reset --hard origin/master
>> which throws away any local commits and uncommitted changes in your
>> working directory.
>> I fail to understand why you would ever need this script.  Can you
>> please elaborate?

Jude DaShiell <address@hidden> writes:

> Whenever I apply a patch to the Makefile an orgmode update fails since 
> my local changes have to be stashed or commited according to git.  It's 
> the merge step that fails.
> I probably know less about git than I ought to, but that's what's 
> happened over here.

Okay - there's an article on Worg about keeping local changes on top of
org-mode development (basically you commit your Makefile changes and
always rebase on top of origin/master -- which happens automatically
when you merge with git pull)

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

$ git checkout master
$ git reset --hard origin/master

and then redo your Makefile changes instead of recloning.

Let me know if I can provide any information to make this less painful
for you.


reply via email to

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